mm/hwpoison: introduce folio_contain_hwpoisoned_page() helper

commit 5f5ee52d4f58605330b09851273d6e56aaadd29e upstream.

Patch series "mm/vmscan: don't try to reclaim hwpoison folio".

Fix a bug during memory reclaim if folio is hwpoisoned.

This patch (of 2):

Introduce helper folio_contain_hwpoisoned_page() to check if the entire
folio is hwpoisoned or it contains hwpoisoned pages.

Link: https://lkml.kernel.org/r/20250318083939.987651-1-tujinjiang@huawei.com
Link: https://lkml.kernel.org/r/20250318083939.987651-2-tujinjiang@huawei.com
Signed-off-by: Jinjiang Tu <tujinjiang@huawei.com>
Acked-by: Miaohe Lin <linmiaohe@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Nanyong Sun <sunnanyong@huawei.com>
Cc: Naoya Horiguchi <nao.horiguchi@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index 691506bdf2c5a82ba0308b0f68e5a150a7eebdb0..27f38932c1c417b56074434946fb6a88503f0b18 100644 (file)
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -1113,6 +1113,12 @@ static inline bool is_page_hwpoison(const struct page *page)
        return folio_test_hugetlb(folio) && PageHWPoison(&folio->page);
 }
 
+static inline bool folio_contain_hwpoisoned_page(struct folio *folio)
+{
+       return folio_test_hwpoison(folio) ||
+           (folio_test_large(folio) && folio_test_has_hwpoisoned(folio));
+}
+
 bool is_free_buddy_page(const struct page *page);
 
 PAGEFLAG(Isolated, isolated, PF_ANY);

diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index c3de3538926987f0e2bd7510be0357692cd00d86..1aba13e019095d85cdb7e093d6695fa5931eccde 100644 (file)
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1801,8 +1801,7 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn)
                if (unlikely(page_folio(page) != folio))
                        goto put_folio;
 
-               if (folio_test_hwpoison(folio) ||
-                   (folio_test_large(folio) && folio_test_has_hwpoisoned(folio))) {
+               if (folio_contain_hwpoisoned_page(folio)) {
                        if (WARN_ON(folio_test_lru(folio)))
                                folio_isolate_lru(folio);
                        if (folio_mapped(folio)) {

diff --git a/mm/shmem.c b/mm/shmem.c
index e10d6e092462053734c1a211be12a2cfd6edbdcf..ce5c12b93ad1a27b3b6531d55dc2d1ac11c9ecc6 100644 (file)
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -3121,8 +3121,7 @@ shmem_write_begin(struct file *file, struct address_space *mapping,
        if (ret)
                return ret;
 
-       if (folio_test_hwpoison(folio) ||
-           (folio_test_large(folio) && folio_test_has_hwpoisoned(folio))) {
+       if (folio_contain_hwpoisoned_page(folio)) {
                folio_unlock(folio);
                folio_put(folio);
                return -EIO;