The quilt patch titled
Subject: mm: memory-failure: avoid pfn_valid() twice in soft_offline_page()
has been removed from the -mm tree. Its filename was
mm-memory-failure-avoid-pfn_valid-twice-in-soft_offline_page.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Subject: mm: memory-failure: avoid pfn_valid() twice in soft_offline_page()
Date: Fri, 21 Oct 2022 16:46:10 +0800
Simplify WARN_ON_ONCE(flags & MF_COUNT_INCREASED) under !pfn_valid().
Link: https://lkml.kernel.org/r/20221021084611.53765-2-wangkefeng.wang@xxxxxxxxxx
Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Acked-by: Naoya Horiguchi <naoya.horiguchi@xxxxxxx>
Reviewed-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory-failure.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/mm/memory-failure.c~mm-memory-failure-avoid-pfn_valid-twice-in-soft_offline_page
+++ a/mm/memory-failure.c
@@ -2551,10 +2551,10 @@ int soft_offline_page(unsigned long pfn,
bool try_again = true;
struct page *page;
- WARN_ON_ONCE(!pfn_valid(pfn) && (flags & MF_COUNT_INCREASED));
-
- if (!pfn_valid(pfn))
+ if (!pfn_valid(pfn)) {
+ WARN_ON_ONCE(flags & MF_COUNT_INCREASED);
return -ENXIO;
+ }
/* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */
page = pfn_to_online_page(pfn);
_
Patches currently in -mm which might be from wangkefeng.wang@xxxxxxxxxx are
