The patch titled
Subject: zsmalloc: move away from page order defines
has been added to the -mm mm-unstable branch. Its filename is
zsmalloc-move-away-from-page-order-defines.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/zsmalloc-move-away-from-page-order-defines.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: zsmalloc: move away from page order defines
Date: Mon, 31 Oct 2022 14:41:02 +0900
There is no reason for us to require pages per-zspage to be a power of
two. Rename macros and use plain limit numbers there instead of 2 ^ N
values. This will let us to have more tunable limits.
Link: https://lkml.kernel.org/r/20221031054108.541190-4-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>
---
include/linux/zsmalloc.h | 16 +++++++---------
mm/zsmalloc.c | 4 +---
2 files changed, 8 insertions(+), 12 deletions(-)
--- a/include/linux/zsmalloc.h~zsmalloc-move-away-from-page-order-defines
+++ a/include/linux/zsmalloc.h
@@ -33,17 +33,15 @@ enum zs_mapmode {
*/
};
-#define ZS_PAGE_ORDER_2 2
-#define ZS_PAGE_ORDER_4 4
-
/*
- * A single 'zspage' is composed of up to 2^N discontiguous 0-order (single)
- * pages. ZS_MAX_PAGE_ORDER defines upper limit on N, ZS_MIN_PAGE_ORDER
- * defines lower limit on N. ZS_DEFAULT_PAGE_ORDER is recommended value.
+ * A single 'zspage' is composed of up to N discontiguous 0-order
+ * (single) pages. ZS_MAX_PAGES_PER_ZSPAGE defines upper limit on N,
+ * ZS_MIN_PAGES_PER_ZSPAGE defines lower limit on N.
+ * ZS_DEFAULT_PAGES_PER_ZSPAGE is a recommended value.
*/
-#define ZS_MIN_PAGE_ORDER ZS_PAGE_ORDER_2
-#define ZS_MAX_PAGE_ORDER ZS_PAGE_ORDER_4
-#define ZS_DEFAULT_PAGE_ORDER ZS_PAGE_ORDER_2
+#define ZS_MIN_PAGES_PER_ZSPAGE 1
+#define ZS_MAX_PAGES_PER_ZSPAGE 16
+#define ZS_DEFAULT_PAGES_PER_ZSPAGE 4
struct zs_pool_stats {
/* How many pages were migrated (freed) */
--- a/mm/zsmalloc.c~zsmalloc-move-away-from-page-order-defines
+++ a/mm/zsmalloc.c
@@ -73,8 +73,6 @@
*/
#define ZS_ALIGN 8
-#define ZS_MAX_PAGES_PER_ZSPAGE (_AC(1, UL) << ZS_MAX_PAGE_ORDER)
-
#define ZS_HANDLE_SIZE (sizeof(unsigned long))
/*
@@ -2336,7 +2334,7 @@ struct zs_pool *zs_create_pool(const cha
if (!pool)
return NULL;
- num_pages = 1UL << ZS_DEFAULT_PAGE_ORDER;
+ num_pages = ZS_DEFAULT_PAGES_PER_ZSPAGE;
/* min_alloc_size must be multiple of ZS_ALIGN */
pool->min_alloc_size = num_pages << PAGE_SHIFT >> OBJ_INDEX_BITS;
pool->min_alloc_size = max(pool->min_alloc_size, ZS_MIN_ALLOC_SIZE);
_
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
