The quilt patch titled
Subject: zram: add recompression algorithm choice to Kconfig
has been removed from the -mm tree. Its filename was
zram-add-recompression-algorithm-choice-to-kconfig.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Sergey Senozhatsky <senozhatsky@xxxxxxxxxxxx>
Subject: zram: add recompression algorithm choice to Kconfig
Date: Tue, 18 Oct 2022 13:55:30 +0900
Make (secondary) recompression algorithm selectable just like we do it for
the (primary) default one.
Link: https://lkml.kernel.org/r/20221018045533.2396670-7-senozhatsky@xxxxxxxxxxxx
Signed-off-by: Sergey Senozhatsky <senozhatsky@xxxxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/Kconfig | 40 ++++++++++++++++++++++++++++++++
drivers/block/zram/zram_drv.c | 2 -
2 files changed, 41 insertions(+), 1 deletion(-)
--- a/drivers/block/zram/Kconfig~zram-add-recompression-algorithm-choice-to-kconfig
+++ a/drivers/block/zram/Kconfig
@@ -93,3 +93,43 @@ config ZRAM_MULTI_COMP
SIZE (in bytes) parameter sets the object size watermark: idle
objects that are of a smaller size will not get recompressed.
+
+choice
+ prompt "Default zram recompression algorithm"
+ default ZRAM_DEF_RECOMP_ZSTD
+ depends on ZRAM && ZRAM_MULTI_COMP
+
+config ZRAM_DEF_RECOMP_LZORLE
+ bool "lzo-rle"
+ depends on CRYPTO_LZO
+
+config ZRAM_DEF_RECOMP_ZSTD
+ bool "zstd"
+ depends on CRYPTO_ZSTD
+
+config ZRAM_DEF_RECOMP_LZ4
+ bool "lz4"
+ depends on CRYPTO_LZ4
+
+config ZRAM_DEF_RECOMP_LZO
+ bool "lzo"
+ depends on CRYPTO_LZO
+
+config ZRAM_DEF_RECOMP_LZ4HC
+ bool "lz4hc"
+ depends on CRYPTO_LZ4HC
+
+config ZRAM_DEF_RECOMP_842
+ bool "842"
+ depends on CRYPTO_842
+
+endchoice
+
+config ZRAM_DEF_RECOMP
+ string
+ default "lzo-rle" if ZRAM_DEF_RECOMP_LZORLE
+ default "zstd" if ZRAM_DEF_RECOMP_ZSTD
+ default "lz4" if ZRAM_DEF_RECOMP_LZ4
+ default "lzo" if ZRAM_DEF_RECOMP_LZO
+ default "lz4hc" if ZRAM_DEF_RECOMP_LZ4HC
+ default "842" if ZRAM_DEF_RECOMP_842
--- a/drivers/block/zram/zram_drv.c~zram-add-recompression-algorithm-choice-to-kconfig
+++ a/drivers/block/zram/zram_drv.c
@@ -44,7 +44,7 @@ static int zram_major;
static const char *default_comp_algs[ZRAM_MAX_ZCOMPS] = {
CONFIG_ZRAM_DEF_COMP,
#ifdef CONFIG_ZRAM_MULTI_COMP
- "zstd",
+ CONFIG_ZRAM_DEF_RECOMP,
#endif
};
_
Patches currently in -mm which might be from senozhatsky@xxxxxxxxxxxx are
zram-add-recompress-flag-to-read_block_state.patch
zram-clarify-writeback_store-comment.patch
zram-use-is_err_value-to-check-for-zs_malloc-errors.patch
zsmalloc-turn-zspage-order-into-runtime-variable.patch
zsmalloc-move-away-from-page-order-defines.patch
zsmalloc-make-huge-class-watermark-zs_pool-member.patch
zram-huge-size-watermark-cannot-be-global.patch
zsmalloc-pass-limit-on-pages-per-zspage-to-zs_create_pool.patch
zram-add-pages_per_pool_page-device-attribute.patch
documentation-document-zram-pages_per_pool_page-attribute.patch
zsmalloc-break-out-of-loop-when-found-perfect-zspage-order.patch
