shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: PM: hibernate: Add support for LZ4 compression for hibernation

Browse Source 
Extend the support for LZ4 compression to be used with hibernation.
The main idea is that different compression algorithms
have different characteristics and hibernation may benefit when it uses
any of these algorithms: a default algorithm, having higher
compression rate but is slower(compression/decompression) and a
secondary algorithm, that is faster(compression/decompression) but has
lower compression rate.

LZ4 algorithm has better decompression speeds over LZO. This reduces
the hibernation image restore time.
As per test results:
                                    LZO             LZ4
Size before Compression(bytes)   682696704       682393600
Size after Compression(bytes)    146502402       155993547
Decompression Rate               335.02 MB/s     501.05 MB/s
Restore time                       4.4s             3.8s

LZO is the default compression algorithm used for hibernation. Enable
CONFIG_HIBERNATION_COMP_LZ4 to set the default compressor as LZ4.

Bug: 335581841
Signed-off-by: Nikhil V <quic_nprakash@quicinc.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 8bc29736357e7f9a6bd0d16b57b5612197e1924b)
Change-Id: I640d834bb626e9a139e41740d4bef7548d5c6401
Signed-off-by: Nikhil V <quic_nprakash@quicinc.com>
This commit is contained in:
Nikhil V
2024-01-22 18:45:27 +05:30
parent 990d3701d0
commit 76c7e9747b
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/power/Kconfig
View File

@@ -101,11 +101,16 @@ config HIBERNATION_COMP_LZO
bool "lzo" bool "lzo"
depends on CRYPTO_LZO depends on CRYPTO_LZO
config HIBERNATION_COMP_LZ4
bool "lz4"
depends on CRYPTO_LZ4
endchoice endchoice
config HIBERNATION_DEF_COMP config HIBERNATION_DEF_COMP
string string
default "lzo" if HIBERNATION_COMP_LZO default "lzo" if HIBERNATION_COMP_LZO
default "lz4" if HIBERNATION_COMP_LZ4
help help
Default compressor to be used for hibernation. Default compressor to be used for hibernation.

25
kernel/power/hibernate.c
View File

@@ -725,6 +725,9 @@ static int load_image_and_restore(void)
return error; return error;
} }
#define COMPRESSION_ALGO_LZO "lzo"
#define COMPRESSION_ALGO_LZ4 "lz4"
/** /**
* hibernate - Carry out system hibernation, including saving the image. * hibernate - Carry out system hibernation, including saving the image.
*/ */
@@ -786,11 +789,24 @@ int hibernate(void)
if (hibernation_mode == HIBERNATION_PLATFORM) if (hibernation_mode == HIBERNATION_PLATFORM)
flags |= SF_PLATFORM_MODE; flags |= SF_PLATFORM_MODE;
if (nocompress) if (nocompress) {
flags |= SF_NOCOMPRESS_MODE; flags |= SF_NOCOMPRESS_MODE;
else } else {
flags |= SF_CRC32_MODE; flags |= SF_CRC32_MODE;
/*
* By default, LZO compression is enabled. Use SF_COMPRESSION_ALG_LZ4
* to override this behaviour and use LZ4.
*
* Refer kernel/power/power.h for more details
*/
if (!strcmp(hib_comp_algo, COMPRESSION_ALGO_LZ4))
flags |= SF_COMPRESSION_ALG_LZ4;
else
flags |= SF_COMPRESSION_ALG_LZO;
}
pm_pr_dbg("Writing hibernation image.\n"); pm_pr_dbg("Writing hibernation image.\n");
error = swsusp_write(flags); error = swsusp_write(flags);
swsusp_free(); swsusp_free();
@@ -1021,7 +1037,10 @@ static int software_resume(void)
* the algorithm support. * the algorithm support.
*/ */
if (!(swsusp_header_flags & SF_NOCOMPRESS_MODE)) { if (!(swsusp_header_flags & SF_NOCOMPRESS_MODE)) {
strscpy(hib_comp_algo, default_compressor, sizeof(hib_comp_algo)); if (swsusp_header_flags & SF_COMPRESSION_ALG_LZ4)
strscpy(hib_comp_algo, COMPRESSION_ALGO_LZ4, sizeof(hib_comp_algo));
else
strscpy(hib_comp_algo, default_compressor, sizeof(hib_comp_algo));
if (crypto_has_comp(hib_comp_algo, 0, 0) != 1) { if (crypto_has_comp(hib_comp_algo, 0, 0) != 1) {
pr_err("%s compression is not available\n", hib_comp_algo); pr_err("%s compression is not available\n", hib_comp_algo);
error = -EOPNOTSUPP; error = -EOPNOTSUPP;

14
kernel/power/power.h
View File

@@ -173,11 +173,25 @@ extern int swsusp_swap_in_use(void);
* Flags that can be passed from the hibernatig hernel to the "boot" kernel in * Flags that can be passed from the hibernatig hernel to the "boot" kernel in
* the image header. * the image header.
*/ */
#define SF_COMPRESSION_ALG_LZO 0 /* dummy, details given below */
#define SF_PLATFORM_MODE 1 #define SF_PLATFORM_MODE 1
#define SF_NOCOMPRESS_MODE 2 #define SF_NOCOMPRESS_MODE 2
#define SF_CRC32_MODE 4 #define SF_CRC32_MODE 4
#define SF_HW_SIG 8 #define SF_HW_SIG 8
/*
* Bit to indicate the compression algorithm to be used(for LZ4). The same
* could be checked while saving/loading image to/from disk to use the
* corresponding algorithms.
*
* By default, LZO compression is enabled if SF_CRC32_MODE is set. Use
* SF_COMPRESSION_ALG_LZ4 to override this behaviour and use LZ4.
*
* SF_CRC32_MODE, SF_COMPRESSION_ALG_LZO(dummy) -> Compression, LZO
* SF_CRC32_MODE, SF_COMPRESSION_ALG_LZ4 -> Compression, LZ4
*/
#define SF_COMPRESSION_ALG_LZ4 16
/* kernel/power/hibernate.c */ /* kernel/power/hibernate.c */
extern int swsusp_check(void); extern int swsusp_check(void);
extern void swsusp_free(void); extern void swsusp_free(void);