zram: filter out recomp targets based on priority

Do no select for post processing slots that are already compressed with
same or higher priority compression algorithm.

This should save some memory, as previously we would still put those
entries into corresponding post-processing buckets and filter them out
later in recompress_slot().

Link: https://lkml.kernel.org/r/20250303022425.285971-10-senozhatsky@chromium.org
Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Hillf Danton <hdanton@sina.com>
Cc: Kairui Song <ryncsn@gmail.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Yosry Ahmed <yosry.ahmed@linux.dev>
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 776c31606eec812ed839a4057be513f79f38531b..6dee885bef9b7786529037c947e5957f24b3127d 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1823,7 +1823,7 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec,
 #define RECOMPRESS_IDLE                (1 << 0)
 #define RECOMPRESS_HUGE                (1 << 1)
 
-static int scan_slots_for_recompress(struct zram *zram, u32 mode,
+static int scan_slots_for_recompress(struct zram *zram, u32 mode, u32 prio_max,
                                     struct zram_pp_ctl *ctl)
 {
        unsigned long nr_pages = zram->disksize >> PAGE_SHIFT;
@@ -1855,6 +1855,10 @@ static int scan_slots_for_recompress(struct zram *zram, u32 mode,
                    zram_test_flag(zram, index, ZRAM_INCOMPRESSIBLE))
                        goto next;
 
+               /* Already compressed with same of higher priority */
+               if (zram_get_priority(zram, index) + 1 >= prio_max)
+                       goto next;
+
                pps->index = index;
                place_pp_slot(zram, ctl, pps);
                pps = NULL;
@@ -1911,6 +1915,16 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page,
        zram_clear_flag(zram, index, ZRAM_IDLE);
 
        class_index_old = zs_lookup_class_index(zram->mem_pool, comp_len_old);
+
+       prio = max(prio, zram_get_priority(zram, index) + 1);
+       /*
+        * Recompression slots scan should not select slots that are
+        * already compressed with a higher priority algorithm, but
+        * just in case
+        */
+       if (prio >= prio_max)
+               return 0;
+
        /*
         * Iterate the secondary comp algorithms list (in order of priority)
         * and try to recompress the page.
@@ -1919,13 +1933,6 @@ static int recompress_slot(struct zram *zram, u32 index, struct page *page,
                if (!zram->comps[prio])
                        continue;
 
-               /*
-                * Skip if the object is already re-compressed with a higher
-                * priority algorithm (or same algorithm).
-                */
-               if (prio <= zram_get_priority(zram, index))
-                       continue;
-
                num_recomps++;
                zstrm = zcomp_stream_get(zram->comps[prio]);
                src = kmap_local_page(page);
@@ -2150,7 +2157,7 @@ static ssize_t recompress_store(struct device *dev,
                goto release_init_lock;
        }
 
-       scan_slots_for_recompress(zram, mode, ctl);
+       scan_slots_for_recompress(zram, mode, prio_max, ctl);
 
        ret = len;
        while ((pps = select_pp_slot(ctl))) {