Skip to content

Commit

Permalink
mm/hugetlb: convert __update_and_free_page() to folios
Browse files Browse the repository at this point in the history
Change __update_and_free_page() to __update_and_free_hugetlb_folio() by
changing its callers to pass in a folio.

Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Sidhartha Kumar <[email protected]>
Reviewed-by: Mike Kravetz <[email protected]>
Cc: John Hubbard <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Cc: Muchun Song <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
  • Loading branch information
sidkumar99 authored and akpm00 committed Feb 13, 2023
1 parent 6aa3a92 commit 6f6956c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions mm/hugetlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1698,10 +1698,10 @@ static void add_hugetlb_folio(struct hstate *h, struct folio *folio,
enqueue_hugetlb_folio(h, folio);
}

static void __update_and_free_page(struct hstate *h, struct page *page)
static void __update_and_free_hugetlb_folio(struct hstate *h,
struct folio *folio)
{
int i;
struct folio *folio = page_folio(page);
struct page *subpage;

if (hstate_is_gigantic(h) && !gigantic_page_runtime_supported())
Expand All @@ -1714,7 +1714,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
if (folio_test_hugetlb_raw_hwp_unreliable(folio))
return;

if (hugetlb_vmemmap_restore(h, page)) {
if (hugetlb_vmemmap_restore(h, &folio->page)) {
spin_lock_irq(&hugetlb_lock);
/*
* If we cannot allocate vmemmap pages, just refuse to free the
Expand Down Expand Up @@ -1750,7 +1750,7 @@ static void __update_and_free_page(struct hstate *h, struct page *page)
destroy_compound_gigantic_folio(folio, huge_page_order(h));
free_gigantic_folio(folio, huge_page_order(h));
} else {
__free_pages(page, huge_page_order(h));
__free_pages(&folio->page, huge_page_order(h));
}
}

Expand Down Expand Up @@ -1790,7 +1790,7 @@ static void free_hpage_workfn(struct work_struct *work)
*/
h = size_to_hstate(page_size(page));

__update_and_free_page(h, page);
__update_and_free_hugetlb_folio(h, page_folio(page));

cond_resched();
}
Expand All @@ -1807,7 +1807,7 @@ static void update_and_free_hugetlb_folio(struct hstate *h, struct folio *folio,
bool atomic)
{
if (!folio_test_hugetlb_vmemmap_optimized(folio) || !atomic) {
__update_and_free_page(h, &folio->page);
__update_and_free_hugetlb_folio(h, folio);
return;
}

Expand Down

0 comments on commit 6f6956c

Please sign in to comment.