mm/memory-failure: convert hugetlb_clear_page_hwpoison to folios

Change hugetlb_clear_page_hwpoison() to folio_clear_hugetlb_hwpoison() by
changing the function to take in a folio.  This converts one use of
ClearPageHWPoison and HPageRawHwpUnreliable to their folio equivalents.

Link: https://lkml.kernel.org/r/20230112204608.80136-4-sidhartha.kumar@oracle.com
Signed-off-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Acked-by: Naoya Horiguchi <naoya.horiguchi@nec.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 7d6413c3b8f5d8f73a646c1abb153a8bdf6adfc3..cf60fe741c1dc6a091dd10d7b849ec1c9157f81a 100644 (file)
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -878,9 +878,9 @@ extern int dissolve_free_huge_pages(unsigned long start_pfn,
                                    unsigned long end_pfn);
 
 #ifdef CONFIG_MEMORY_FAILURE
-extern void hugetlb_clear_page_hwpoison(struct page *hpage);
+extern void folio_clear_hugetlb_hwpoison(struct folio *folio);
 #else
-static inline void hugetlb_clear_page_hwpoison(struct page *hpage)
+static inline void folio_clear_hugetlb_hwpoison(struct folio *folio)
 {
 }
 #endif

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index ca9e177b9c54d178bb5badafbedcad0952ebfaa1..291ad4cb02f908b9268199dd72af1d7f11e55f26 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1731,7 +1731,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
         * which makes any healthy subpages reusable.
         */
        if (unlikely(folio_test_hwpoison(folio)))
-               hugetlb_clear_page_hwpoison(&folio->page);
+               folio_clear_hugetlb_hwpoison(folio);
 
        for (i = 0; i < pages_per_huge_page(h); i++) {
                subpage = folio_page(folio, i);

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 19f6035608d5b225ccbc3203d2abae301b810453..d4aaed2756af55a8e97cf4e4abfc3a02ab33bbc6 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1785,12 +1785,12 @@ static unsigned long free_raw_hwp_pages(struct page *hpage, bool move_flag)
        return __free_raw_hwp_pages(hpage, move_flag);
 }
 
-void hugetlb_clear_page_hwpoison(struct page *hpage)
+void folio_clear_hugetlb_hwpoison(struct folio *folio)
 {
-       if (HPageRawHwpUnreliable(hpage))
+       if (folio_test_hugetlb_raw_hwp_unreliable(folio))
                return;
-       ClearPageHWPoison(hpage);
-       free_raw_hwp_pages(hpage, true);
+       folio_clear_hwpoison(folio);
+       free_raw_hwp_pages(&folio->page, true);
 }
 
 /*
@@ -1889,7 +1889,7 @@ retry:
        folio_lock(folio);
 
        if (hwpoison_filter(p)) {
-               hugetlb_clear_page_hwpoison(&folio->page);
+               folio_clear_hugetlb_hwpoison(folio);
                if (migratable_cleared)
                        folio_set_hugetlb_migratable(folio);
                folio_unlock(folio);