zram: add size class equals check into recompression

It makes no sense for us to recompress the object if it will be in the
same size class.  We anyway don't get any memory gain.  But, at the same
time, we get a CPU time overhead when inserting this object into zspage
and decompressing it afterwards.

[senozhatsky: rebased and fixed conflicts]
Link: https://lkml.kernel.org/r/20221109115047.2921851-9-senozhatsky@chromium.org
Signed-off-by: Alexey Romanov <avromanov@sberdevices.ru>
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Suleiman Souhlal <suleiman@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 473fc5eb71a13326a3da6cfece57cf514662bf71..66659f16f6c8b490ab7872e176f7b45a024876da 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1672,6 +1672,8 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page,
        unsigned long handle_new;
        unsigned int comp_len_old;
        unsigned int comp_len_new;
+       unsigned int class_index_old;
+       unsigned int class_index_new;
        void *src, *dst;
        int ret;
 
@@ -1690,6 +1692,7 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page,
        if (ret)
                return ret;
 
+       class_index_old = zs_lookup_class_index(zram->mem_pool, comp_len_old);
        /*
         * Iterate the secondary comp algorithms list (in order of priority)
         * and try to recompress the page.
@@ -1715,9 +1718,13 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page,
                        return ret;
                }
 
+               class_index_new = zs_lookup_class_index(zram->mem_pool,
+                                                       comp_len_new);
+
                /* Continue until we make progress */
                if (comp_len_new >= huge_class_size ||
                    comp_len_new >= comp_len_old ||
+                   class_index_new >= class_index_old ||
                    (threshold && comp_len_new >= threshold)) {
                        zcomp_stream_put(zram->comps[prio]);
                        continue;
@@ -1740,7 +1747,9 @@ static int zram_recompress(struct zram *zram, u32 index, struct page *page,
         * that would save memory, mark the object as incompressible so that
         * we will not try to compress it again.
         */
-       if (comp_len_new >= huge_class_size || comp_len_new >= comp_len_old) {
+       if (comp_len_new >= huge_class_size ||
+           comp_len_new >= comp_len_old ||
+           class_index_new >= class_index_old) {
                zram_set_flag(zram, index, ZRAM_INCOMPRESSIBLE);
                return 0;
        }

diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h
index 2a430e713ce513242ce12da2def0bed5038e34bf..a48cd0ffe57dda457f6d44ba8e00ccfdace99003 100644 (file)
--- a/include/linux/zsmalloc.h
+++ b/include/linux/zsmalloc.h
@@ -55,5 +55,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle);
 unsigned long zs_get_total_pages(struct zs_pool *pool);
 unsigned long zs_compact(struct zs_pool *pool);
 
+unsigned int zs_lookup_class_index(struct zs_pool *pool, unsigned int size);
+
 void zs_pool_stats(struct zs_pool *pool, struct zs_pool_stats *stats);
 #endif

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index b52b7bb88b5222e7c1f55f2bfacf1f5f9ae58944..78feda34ad9a8ed3322b78725f3b42b26fce5b0e 100644 (file)
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1205,6 +1205,27 @@ static bool zspage_full(struct size_class *class, struct zspage *zspage)
        return get_zspage_inuse(zspage) == class->objs_per_zspage;
 }
 
+/**
+ * zs_lookup_class_index() - Returns index of the zsmalloc &size_class
+ * that hold objects of the provided size.
+ * @pool: zsmalloc pool to use
+ * @size: object size
+ *
+ * Context: Any context.
+ *
+ * Return: the index of the zsmalloc &size_class that hold objects of the
+ * provided size.
+ */
+unsigned int zs_lookup_class_index(struct zs_pool *pool, unsigned int size)
+{
+       struct size_class *class;
+
+       class = pool->size_class[get_size_class_index(size)];
+
+       return class->index;
+}
+EXPORT_SYMBOL_GPL(zs_lookup_class_index);
+
 unsigned long zs_get_total_pages(struct zs_pool *pool)
 {
        return atomic_long_read(&pool->pages_allocated);