Skip to content

Commit 630e7c5

Browse files
Kefeng Wangakpm00
authored andcommitted
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/[email protected] Signed-off-by: Kefeng Wang <[email protected]> Cc: Mike Kravetz <[email protected]> Cc: Matthew Wilcox <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent c2ca7a5 commit 630e7c5

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

mm/huge_memory.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2935,6 +2935,7 @@ static void split_huge_pages_all(void)
29352935
{
29362936
struct zone *zone;
29372937
struct page *page;
2938+
struct folio *folio;
29382939
unsigned long pfn, max_zone_pfn;
29392940
unsigned long total = 0, split = 0;
29402941

@@ -2947,24 +2948,32 @@ static void split_huge_pages_all(void)
29472948
int nr_pages;
29482949

29492950
page = pfn_to_online_page(pfn);
2950-
if (!page || !get_page_unless_zero(page))
2951+
if (!page || PageTail(page))
2952+
continue;
2953+
folio = page_folio(page);
2954+
if (!folio_try_get(folio))
29512955
continue;
29522956

2953-
if (zone != page_zone(page))
2957+
if (unlikely(page_folio(page) != folio))
2958+
goto next;
2959+
2960+
if (zone != folio_zone(folio))
29542961
goto next;
29552962

2956-
if (!PageHead(page) || PageHuge(page) || !PageLRU(page))
2963+
if (!folio_test_large(folio)
2964+
|| folio_test_hugetlb(folio)
2965+
|| !folio_test_lru(folio))
29572966
goto next;
29582967

29592968
total++;
2960-
lock_page(page);
2961-
nr_pages = thp_nr_pages(page);
2962-
if (!split_huge_page(page))
2969+
folio_lock(folio);
2970+
nr_pages = folio_nr_pages(folio);
2971+
if (!split_folio(folio))
29632972
split++;
29642973
pfn += nr_pages - 1;
2965-
unlock_page(page);
2974+
folio_unlock(folio);
29662975
next:
2967-
put_page(page);
2976+
folio_put(folio);
29682977
cond_resched();
29692978
}
29702979
}

0 commit comments

Comments
 (0)