The patch titled
Subject: zsmalloc: make huge class watermark zs_pool member
has been added to the -mm mm-unstable branch. Its filename is
zsmalloc-make-huge-class-watermark-zs_pool-member.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/zsmalloc-make-huge-class-watermark-zs_pool-member.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: make huge class watermark zs_pool member
Date: Thu, 27 Oct 2022 13:26:46 +0900
We will permit per-pool configuration of pages per-zspage value, which
changes characteristics of the classes and moves around huge class size
watermark. Thus huge class size needs to be a per-pool variable.
Link: https://lkml.kernel.org/r/20221027042651.234524-5-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>
---
--- a/mm/zsmalloc.c~zsmalloc-make-huge-class-watermark-zs_pool-member
+++ a/mm/zsmalloc.c
@@ -178,7 +178,6 @@ static struct dentry *zs_stat_root;
* (see: fix_fullness_group())
*/
static const int fullness_threshold_frac = 4;
-static size_t huge_class_size;
struct size_class {
spinlock_t lock;
@@ -227,6 +226,7 @@ struct zs_pool {
u32 num_size_classes;
u32 min_alloc_size;
+ size_t huge_class_size;
struct zs_pool_stats stats;
@@ -1350,7 +1350,7 @@ EXPORT_SYMBOL_GPL(zs_unmap_object);
*/
size_t zs_huge_class_size(struct zs_pool *pool)
{
- return huge_class_size;
+ return pool->huge_class_size;
}
EXPORT_SYMBOL_GPL(zs_huge_class_size);
@@ -2264,8 +2264,8 @@ struct zs_pool *zs_create_pool(const cha
* endup in the huge class.
*/
if (pages_per_zspage != 1 && objs_per_zspage != 1 &&
- !huge_class_size) {
- huge_class_size = size;
+ !pool->huge_class_size) {
+ pool->huge_class_size = size;
/*
* The object uses ZS_HANDLE_SIZE bytes to store the
* handle. We need to subtract it, because zs_malloc()
@@ -2275,7 +2275,7 @@ struct zs_pool *zs_create_pool(const cha
* class because it grows by ZS_HANDLE_SIZE extra bytes
* right before class lookup.
*/
- huge_class_size -= (ZS_HANDLE_SIZE - 1);
+ pool->huge_class_size -= (ZS_HANDLE_SIZE - 1);
}
/*
_
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
