kevin/linux
1
Fork 0
Code

mm/hugetlb: drop node_alloc_noretry from alloc_fresh_hugetlb_folio

Browse Source 
Since commit d67e32f267 ("hugetlb: restructure pool allocations"), the
parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() is not used,
so drop it.

Link: https://lkml.kernel.org/r/20240516081035.5651-1-osalvador@suse.de
Signed-off-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Reviewed-by: Muchun Song <muchun.song@linux.dev>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Oscar Salvador 2024-05-16 10:10:35 +02:00 committed by Andrew Morton
parent 0ba5e806e1
commit 6584a14a37
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mm/hugetlb.c
View File

@ -2289,13 +2289,11 @@ static struct folio *only_alloc_fresh_hugetlb_folio(struct hstate *h,
* pages is zero. * pages is zero.
*/ */
static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h, static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h,
gfp_t gfp_mask, int nid, nodemask_t *nmask, gfp_t gfp_mask, int nid, nodemask_t *nmask)
nodemask_t *node_alloc_noretry)
{ {
struct folio *folio; struct folio *folio;
folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL);
node_alloc_noretry);
if (!folio) if (!folio)
return NULL; return NULL;
@ -2513,7 +2511,7 @@ static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h,
goto out_unlock; goto out_unlock;
spin_unlock_irq(&hugetlb_lock); spin_unlock_irq(&hugetlb_lock);
folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL); folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask);
if (!folio) if (!folio)
return NULL; return NULL;
@ -2549,7 +2547,7 @@ static struct folio *alloc_migrate_hugetlb_folio(struct hstate *h, gfp_t gfp_mas
if (hstate_is_gigantic(h)) if (hstate_is_gigantic(h))
return NULL; return NULL;
folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL); folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask);
if (!folio) if (!folio)
return NULL; return NULL;
@ -3474,7 +3472,7 @@ static void __init hugetlb_hstate_alloc_pages_onenode(struct hstate *h, int nid)
gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE; gfp_t gfp_mask = htlb_alloc_mask(h) | __GFP_THISNODE;
folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid,
&node_states[N_MEMORY], NULL); &node_states[N_MEMORY]);
if (!folio) if (!folio)
break; break;
free_huge_folio(folio); /* free it into the hugepage allocator */ free_huge_folio(folio); /* free it into the hugepage allocator */