[-next,3/8] mm: huge_memory: convert split_huge_pages_all() to use folios

Commit Message

Kefeng Wang Dec. 13, 2022, 9:27 a.m. UTC

Straightforwardly convert split_huge_pages_all() to use folio function.

Signed-off-by: Kefeng Wang <[e-mail]>
---
 mm/huge_memory.c | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Patch

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index abe6cfd92ffa..02092dd10aa4 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2933,7 +2933,7 @@  static struct shrinker deferred_split_shrinker = {
 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;
 
@@ -2945,25 +2945,27 @@  static void split_huge_pages_all(void)
 		for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++) {
 			int nr_pages;
 
-			page = pfn_to_online_page(pfn);
-			if (!page || !get_page_unless_zero(page))
+			folio = pfn_to_online_folio(pfn);
+			if (!folio || !folio_try_get(folio))
 				continue;
 
-			if (zone != page_zone(page))
+			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();
 		}
 	}