From: Zhongkun He <hezhongkun.hzk@bytedance.com>
Date: Tue, 24 Oct 2023 14:27:06 +0000 (+0800)
Subject: mm: zswap: fix the lack of page lru flag in zswap_writeback_entry
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a844ddcbe0455a42d452751cb135893e0865a0b7;p=users%2Fjedix%2Flinux-maple.git

mm: zswap: fix the lack of page lru flag in zswap_writeback_entry

The zswap_writeback_entry() will add a page to the swap cache, decompress
the entry data into the page, and issue a bio write to write the page back
to the swap device.  Move the page to the tail of lru list through
SetPageReclaim(page) and folio_rotate_reclaimable().

Currently, about half of the pages will fail to move to the tail of lru
list because there is no LRU flag in page which is not in the LRU list but
the cpu_fbatches.  So fix it.

Link: https://lkml.kernel.org/r/20231024142706.195517-1-hezhongkun.hzk@bytedance.com
Signed-off-by: Zhongkun He <hezhongkun.hzk@bytedance.com>
Cc: Dan Streetman <ddstreet@ieee.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nhat Pham <nphamcs@gmail.com>
Cc: Seth Jennings <sjenning@redhat.com>
Cc: Vitaly Wool <vitaly.wool@konsulko.com>
Cc: Yosry Ahmed <yosryahmed@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/zswap.c b/mm/zswap.c
index 74411dfdad92..030cc137138f 100644
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -1144,6 +1144,11 @@ static int zswap_writeback_entry(struct zswap_entry *entry,
 	/* move it to the tail of the inactive list after end_writeback */
 	SetPageReclaim(page);
 
+	if (!PageLRU(page)) {
+		/* drain lru cache to help folio_rotate_reclaimable() */
+		lru_add_drain();
+	}
+
 	/* start writeback */
 	__swap_writepage(page, &wbc);
 	put_page(page);