From: Miaohe Lin <linmiaohe@huawei.com>
Date: Wed, 28 Jun 2023 01:49:29 +0000 (+0800)
Subject: mm: memory-failure: remove unneeded page state check in shake_page()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b7b618da0edc85280e1c9c8f4f5239571e7c1d3e;p=linux.git

mm: memory-failure: remove unneeded page state check in shake_page()

Remove unneeded PageLRU(p) and is_free_buddy_page(p) check as slab caches
are not shrunk now.  This check can be added back when a lightweight range
based shrinker is available.

Link: https://lkml.kernel.org/r/20230628014929.3441386-1-linmiaohe@huawei.com
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index ece5d481b5fff..1ddb25a1073ea 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -363,17 +363,14 @@ void shake_page(struct page *p)
 {
 	if (PageHuge(p))
 		return;
-
-	if (!PageSlab(p)) {
-		lru_add_drain_all();
-		if (PageLRU(p) || is_free_buddy_page(p))
-			return;
-	}
-
 	/*
 	 * TODO: Could shrink slab caches here if a lightweight range-based
 	 * shrinker will be available.
 	 */
+	if (PageSlab(p))
+		return;
+
+	lru_add_drain_all();
 }
 EXPORT_SYMBOL_GPL(shake_page);