The patch titled
Subject: zram: add size class equals check into recompression
has been added to the -mm mm-unstable branch. Its filename is
zram-add-size-class-equals-check-into-recompression.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/zram-add-size-class-equals-check-into-recompression.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: Alexey Romanov <avromanov@xxxxxxxxxxxxxx>
Subject: zram: add size class equals check into recompression
Date: Mon, 24 Oct 2022 15:09:42 +0300
It makes no sense for us to recompress the object if it will be in the
same size class. We don't get any memory gain anyway. But at the same
time, we get a CPU time overhead when inserting this object into zspage
and decompressing it afterwards.
Link: https://lkml.kernel.org/r/20221024120942.13885-1-avromanov@xxxxxxxxxxxxxx
Signed-off-by: Alexey Romanov <avromanov@xxxxxxxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Cc: Sergey Senozhatsky <senozhatsky@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 5 +++++
include/linux/zsmalloc.h | 2 ++
mm/zsmalloc.c | 20 ++++++++++++++++++++
3 files changed, 27 insertions(+)
--- a/drivers/block/zram/zram_drv.c~zram-add-size-class-equals-check-into-recompression
+++ a/drivers/block/zram/zram_drv.c
@@ -1671,6 +1671,8 @@ static int zram_recompress(struct zram *
unsigned long handle_next;
unsigned int comp_len_next;
unsigned int comp_len_prev;
+ unsigned int class_size_next;
+ unsigned int class_size_prev;
struct zcomp_strm *zstrm;
void *src, *dst;
int ret;
@@ -1695,6 +1697,8 @@ static int zram_recompress(struct zram *
ret = zcomp_compress(zstrm, src, &comp_len_next);
kunmap_atomic(src);
+ class_size_prev = zs_get_class_size(zram->mem_pool, comp_len_prev);
+ class_size_next = zs_get_class_size(zram->mem_pool, comp_len_next);
/*
* Either a compression error or we failed to compressed the object
* in a way that will save us memory. Mark the object so that we
@@ -1702,6 +1706,7 @@ static int zram_recompress(struct zram *
*/
if (comp_len_next >= huge_class_size ||
comp_len_next >= comp_len_prev ||
+ class_size_next == class_size_prev ||
ret) {
zram_set_flag(zram, index, ZRAM_RECOMP_SKIP);
zram_clear_flag(zram, index, ZRAM_IDLE);
--- a/include/linux/zsmalloc.h~zram-add-size-class-equals-check-into-recompression
+++ a/include/linux/zsmalloc.h
@@ -69,4 +69,6 @@ unsigned long zs_get_total_pages(struct
unsigned long zs_compact(struct zs_pool *pool);
void zs_pool_stats(struct zs_pool *pool, struct zs_pool_stats *stats);
+
+unsigned int zs_get_class_size(struct zs_pool *pool, unsigned int size);
#endif
--- a/mm/zsmalloc.c~zram-add-size-class-equals-check-into-recompression
+++ a/mm/zsmalloc.c
@@ -1209,6 +1209,26 @@ static bool zspage_full(struct size_clas
return get_zspage_inuse(zspage) == class->objs_per_zspage;
}
+/**
+ * zs_get_class_size() - Returns the size (in bytes) of the
+ * zsmalloc &size_class into which the object with specified
+ * size will be inserted or already inserted.
+ *
+ * @pool: zsmalloc pool to use
+ *
+ * Context: Any context.
+ *
+ * Return: the size (in bytes) of the zsmalloc &size_class into which
+ * the object with specified size will be inserted.
+ */
+unsigned int zs_get_class_size(struct zs_pool *pool, unsigned int size)
+{
+ struct size_class *class = pool->size_class[get_size_class_index(size)];
+
+ return class->size;
+}
+EXPORT_SYMBOL_GPL(zs_get_class_size);
+
unsigned long zs_get_total_pages(struct zs_pool *pool)
{
return atomic_long_read(&pool->pages_allocated);
_
Patches currently in -mm which might be from avromanov@xxxxxxxxxxxxxx are
zram-add-size-class-equals-check-into-recompression.patch
