The patch titled
Subject: zram: huge size watermark cannot be global
has been added to the -mm mm-unstable branch. Its filename is
zram-huge-size-watermark-cannot-be-global.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/zram-huge-size-watermark-cannot-be-global.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Sergey Senozhatsky <senozhatsky@xxxxxxxxxxxx>
Subject: zram: huge size watermark cannot be global
Date: Mon, 31 Oct 2022 14:41:04 +0900
ZRAM will pass pool specific limit on number of pages per-zspages which
will affect pool's characteristics. Namely huge size class watermark
value. Move huge_class_size to struct zram, because this value now can be
unique to the pool (zram device).
Link: https://lkml.kernel.org/r/20221031054108.541190-6-senozhatsky@xxxxxxxxxxxx
Signed-off-by: Sergey Senozhatsky <senozhatsky@xxxxxxxxxxxx>
Cc: Alexey Romanov <avromanov@xxxxxxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 13 +++----------
drivers/block/zram/zram_drv.h | 5 +++++
2 files changed, 8 insertions(+), 10 deletions(-)
--- a/drivers/block/zram/zram_drv.c~zram-huge-size-watermark-cannot-be-global
+++ a/drivers/block/zram/zram_drv.c
@@ -50,12 +50,6 @@ static const char *default_comp_algs[ZRA
/* Module params (documentation at end) */
static unsigned int num_devices = 1;
-/*
- * Pages that compress to sizes equals or greater than this are stored
- * uncompressed in memory.
- */
-static size_t huge_class_size;
-
static const struct block_device_operations zram_devops;
static void zram_free_page(struct zram *zram, size_t index);
@@ -1259,8 +1253,7 @@ static bool zram_meta_alloc(struct zram
return false;
}
- if (!huge_class_size)
- huge_class_size = zs_huge_class_size(zram->mem_pool);
+ zram->huge_class_size = zs_huge_class_size(zram->mem_pool);
return true;
}
@@ -1488,7 +1481,7 @@ compress_again:
return ret;
}
- if (comp_len >= huge_class_size)
+ if (comp_len >= zram->huge_class_size)
comp_len = PAGE_SIZE;
/*
* handle allocation has 2 paths:
@@ -1665,7 +1658,7 @@ static int zram_recompress(struct zram *
* in a way that will save us memory. Mark the object so that we
* don't attempt to re-compress it again (RECOMP_SKIP).
*/
- if (comp_len_next >= huge_class_size ||
+ if (comp_len_next >= zram->huge_class_size ||
comp_len_next >= comp_len_prev ||
class_index_next >= class_index_prev ||
ret) {
--- a/drivers/block/zram/zram_drv.h~zram-huge-size-watermark-cannot-be-global
+++ a/drivers/block/zram/zram_drv.h
@@ -121,6 +121,11 @@ struct zram {
u64 disksize; /* bytes */
const char *comp_algs[ZRAM_MAX_ZCOMPS];
/*
+ * Pages that compress to sizes equal or greater than this are stored
+ * uncompressed in memory.
+ */
+ size_t huge_class_size;
+ /*
* zram is claimed so open request will be failed
*/
bool claim; /* Protected by disk->open_mutex */
_
Patches currently in -mm which might be from senozhatsky@xxxxxxxxxxxx are
zram-preparation-for-multi-zcomp-support.patch
zram-add-recompression-algorithm-sysfs-knob.patch
zram-factor-out-wb-and-non-wb-zram-read-functions.patch
zram-introduce-recompress-sysfs-knob.patch
documentation-add-recompression-documentation.patch
zram-add-recompression-algorithm-choice-to-kconfig.patch
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
