Skip to content

Commit 67bab13

Browse files
Ge Yangakpm00
authored andcommitted
mm/hugetlb: wait for hugetlb folios to be freed
Since the introduction of commit c77c0a8 ("mm/hugetlb: defer freeing of huge pages if in non-task context"), which supports deferring the freeing of hugetlb pages, the allocation of contiguous memory through cma_alloc() may fail probabilistically. In the CMA allocation process, if it is found that the CMA area is occupied by in-use hugetlb folios, these in-use hugetlb folios need to be migrated to another location. When there are no available hugetlb folios in the free hugetlb pool during the migration of in-use hugetlb folios, new folios are allocated from the buddy system. A temporary state is set on the newly allocated folio. Upon completion of the hugetlb folio migration, the temporary state is transferred from the new folios to the old folios. Normally, when the old folios with the temporary state are freed, it is directly released back to the buddy system. However, due to the deferred freeing of hugetlb pages, the PageBuddy() check fails, ultimately leading to the failure of cma_alloc(). Here is a simplified call trace illustrating the process: cma_alloc() ->__alloc_contig_migrate_range() // Migrate in-use hugetlb folios ->unmap_and_move_huge_page() ->folio_putback_hugetlb() // Free old folios ->test_pages_isolated() ->__test_page_isolated_in_pageblock() ->PageBuddy(page) // Check if the page is in buddy To resolve this issue, we have implemented a function named wait_for_freed_hugetlb_folios(). This function ensures that the hugetlb folios are properly released back to the buddy system after their migration is completed. By invoking wait_for_freed_hugetlb_folios() before calling PageBuddy(), we ensure that PageBuddy() will succeed. Link: https://lkml.kernel.org/r/[email protected] Fixes: c77c0a8 ("mm/hugetlb: defer freeing of huge pages if in non-task context") Signed-off-by: Ge Yang <[email protected]> Reviewed-by: Muchun Song <[email protected]> Acked-by: David Hildenbrand <[email protected]> Cc: Baolin Wang <[email protected]> Cc: Barry Song <[email protected]> Cc: Oscar Salvador <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent c3e9983 commit 67bab13

File tree

3 files changed

+23
-0
lines changed

3 files changed

+23
-0
lines changed

include/linux/hugetlb.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,7 @@ struct huge_bootmem_page {
682682

683683
int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list);
684684
int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn);
685+
void wait_for_freed_hugetlb_folios(void);
685686
struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma,
686687
unsigned long addr, bool cow_from_owner);
687688
struct folio *alloc_hugetlb_folio_nodemask(struct hstate *h, int preferred_nid,
@@ -1066,6 +1067,10 @@ static inline int replace_free_hugepage_folios(unsigned long start_pfn,
10661067
return 0;
10671068
}
10681069

1070+
static inline void wait_for_freed_hugetlb_folios(void)
1071+
{
1072+
}
1073+
10691074
static inline struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma,
10701075
unsigned long addr,
10711076
bool cow_from_owner)

mm/hugetlb.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2943,6 +2943,14 @@ int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn)
29432943
return ret;
29442944
}
29452945

2946+
void wait_for_freed_hugetlb_folios(void)
2947+
{
2948+
if (llist_empty(&hpage_freelist))
2949+
return;
2950+
2951+
flush_work(&free_hpage_work);
2952+
}
2953+
29462954
typedef enum {
29472955
/*
29482956
* For either 0/1: we checked the per-vma resv map, and one resv

mm/page_isolation.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,16 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn,
607607
struct zone *zone;
608608
int ret;
609609

610+
/*
611+
* Due to the deferred freeing of hugetlb folios, the hugepage folios may
612+
* not immediately release to the buddy system. This can cause PageBuddy()
613+
* to fail in __test_page_isolated_in_pageblock(). To ensure that the
614+
* hugetlb folios are properly released back to the buddy system, we
615+
* invoke the wait_for_freed_hugetlb_folios() function to wait for the
616+
* release to complete.
617+
*/
618+
wait_for_freed_hugetlb_folios();
619+
610620
/*
611621
* Note: pageblock_nr_pages != MAX_PAGE_ORDER. Then, chunks of free
612622
* pages are not aligned to pageblock_nr_pages.

0 commit comments

Comments
 (0)