mm: huge_memory: convert split_huge_pages_all() to use a folio

Straightforwardly convert split_huge_pages_all() to use a folio.

Link: https://lkml.kernel.org/r/20221229122503.149083-1-wangkefeng.wang@huawei.com
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 0ea6510a3be715e99e312c211e32fc6bb9d9cbe7..7e68a36b4f7d557eeb6417dd8d956d78d93881a1 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2935,6 +2935,7 @@ static void split_huge_pages_all(void)
 {
        struct zone *zone;
        struct page *page;
+       struct folio *folio;
        unsigned long pfn, max_zone_pfn;
        unsigned long total = 0, split = 0;
 
@@ -2947,24 +2948,32 @@ static void split_huge_pages_all(void)
                        int nr_pages;
 
                        page = pfn_to_online_page(pfn);
-                       if (!page || !get_page_unless_zero(page))
+                       if (!page || PageTail(page))
+                               continue;
+                       folio = page_folio(page);
+                       if (!folio_try_get(folio))
                                continue;
 
-                       if (zone != page_zone(page))
+                       if (unlikely(page_folio(page) != folio))
+                               goto next;
+
+                       if (zone != folio_zone(folio))
                                goto next;
 
-                       if (!PageHead(page) || PageHuge(page) || !PageLRU(page))
+                       if (!folio_test_large(folio)
+                               || folio_test_hugetlb(folio)
+                               || !folio_test_lru(folio))
                                goto next;
 
                        total++;
-                       lock_page(page);
-                       nr_pages = thp_nr_pages(page);
-                       if (!split_huge_page(page))
+                       folio_lock(folio);
+                       nr_pages = folio_nr_pages(folio);
+                       if (!split_folio(folio))
                                split++;
                        pfn += nr_pages - 1;
-                       unlock_page(page);
+                       folio_unlock(folio);
 next:
-                       put_page(page);
+                       folio_put(folio);
                        cond_resched();
                }
        }