hugetlb-split-hugetlb_hstate_alloc_pages.patch removed from -mm tree
The quilt patch titled
Subject: hugetlb: split hugetlb_hstate_alloc_pages
has been removed from the -mm tree. Its filename was
hugetlb-split-hugetlb_hstate_alloc_pages.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Gang Li <[email protected]>
Subject: hugetlb: split hugetlb_hstate_alloc_pages
Date: Thu, 22 Feb 2024 22:04:15 +0800
1G and 2M huge pages have different allocation and initialization logic, which leads to subtle differences in parallelization. Therefore, it is appropriate to split hugetlb_hstate_alloc_pages into gigantic and non-gigantic.
This patch has no functional changes.
---
mm/hugetlb.c | 87 ++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 44 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~hugetlb-split-hugetlb_hstate_alloc_pages +43 -44
@@ -3509,6 +3509,43 @@ static void __init hugetlb_hstate_alloc_ } } +static unsigned long __init hugetlb_gigantic_pages_alloc_boot (struct hstate *h) +{ +unsigned long i; + +for (i =0 ; i < h->max_huge_pages; ++i) { +if (!alloc_bootmem_huge_page (h,NUMA_NO_NODE )) +break ; +cond_resched (); + } + +return i; +} + +static unsigned long __init hugetlb_pages_alloc_boot (struct hstate *h) +{ +unsigned long i; +struct folio *folio; +LIST_HEAD (folio_list); +nodemask_t node_alloc_noretry; + +/* Bit mask controlling how hard we retry per-node allocations.*/ +nodes_clear (node_alloc_noretry); + +for (i =0 ; i < h->max_huge_pages; ++i) { + folio =alloc_pool_huge_folio (h, &node_states[N_MEMORY ], + &node_alloc_noretry); +if (!folio) +break ; +list_add (&folio->lru, &folio_list); +cond_resched (); + } + +prep_and_add_allocated_folios (h, &folio_list); + +return i; +} +/* * NOTE: this routine is called in different contexts for gigantic and * non-gigantic pages.
@@ -3522,10 +3559,7 @@ static void __init hugetlb_hstate_alloc_*/ static void __init hugetlb_hstate_alloc_pages (struct hstate *h) { -unsigned long i; -struct folio *folio; -LIST_HEAD (folio_list); -nodemask_t *node_alloc_noretry; +unsigned long allocated;/* skip gigantic hugepages allocation if hugetlb_cma enabled */ if (hstate_is_gigantic (h) && hugetlb_cma_size) {
@@ -3538,47 +3572,12 @@ static void __init hugetlb_hstate_alloc_return ;/* below will do all node balanced alloc */ -if (!hstate_is_gigantic (h)) { -/* -* Bit mask controlling how hard we retry per-node allocations. -* Ignore errors as lower level routines can deal with -* node_alloc_noretry == NULL. If this kmalloc fails at boot -* time, we are likely in bigger trouble. -*/ - node_alloc_noretry =kmalloc (sizeof (*node_alloc_noretry), -GFP_KERNEL ); - }else { -/* allocations done at boot time */ - node_alloc_noretry =NULL ; - } - -/* bit mask controlling how hard we retry per-node allocations */ -if (node_alloc_noretry) -nodes_clear (*node_alloc_noretry); - -for (i =0 ; i < h->max_huge_pages; ++i) { -if (hstate_is_gigantic (h)) { -/* -* gigantic pages not added to list as they are not -* added to pools now. -*/ -if (!alloc_bootmem_huge_page (h,NUMA_NO_NODE )) -break ; - }else { - folio =alloc_pool_huge_folio (h, &node_states[N_MEMORY ], - node_alloc_noretry); -if (!folio) -break ; -list_add (&folio->lru, &folio_list); - } -cond_resched (); - } - -/* list will be empty if hstate_is_gigantic */ -prep_and_add_allocated_folios (h, &folio_list); +if (hstate_is_gigantic (h)) + allocated =hugetlb_gigantic_pages_alloc_boot (h); +else + allocated =hugetlb_pages_alloc_boot (h); -hugetlb_hstate_alloc_pages_errcheck (i, h); -kfree (node_alloc_noretry); +hugetlb_hstate_alloc_pages_errcheck (allocated, h); }static void __init hugetlb_init_hstates (void )
_
Patches currently in -mm which might be from [email protected] are