| Message ID | 20240516081035.5651-1-osalvador@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm/hugetlb: Drop node_alloc_noretry from alloc_fresh_hugetlb_folio | expand |
On 5/16/24 1:10 AM, Oscar Salvador wrote: > Since commit d67e32f26713 ("hugetlb: restructure pool allocations"), > the parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() > is not used, so drop it. > > Signed-off-by: Oscar Salvador <osalvador@suse.de> > --- > mm/hugetlb.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 6be78e7d4f6e..fedce00ff839 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -2289,13 +2289,11 @@ static struct folio *only_alloc_fresh_hugetlb_folio(struct hstate *h, > * pages is zero. > */ > static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h, > - gfp_t gfp_mask, int nid, nodemask_t *nmask, > - nodemask_t *node_alloc_noretry) > + gfp_t gfp_mask, int nid, nodemask_t *nmask) > { > struct folio *folio; > > - folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, > - node_alloc_noretry); > + folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL); > if (!folio) > return NULL; > > @@ -2513,7 +2511,7 @@ static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h, > goto out_unlock; > 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) > 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)) > 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) > 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; > > folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, > - &node_states[N_MEMORY], NULL); > + &node_states[N_MEMORY]); > if (!folio) > break; > free_huge_folio(folio); /* free it into the hugepage allocator */ Reviewed-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>
On 5/16/24 13:40, Oscar Salvador wrote: > Since commit d67e32f26713 ("hugetlb: restructure pool allocations"), > the parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() > is not used, so drop it. > > Signed-off-by: Oscar Salvador <osalvador@suse.de> > --- > mm/hugetlb.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 6be78e7d4f6e..fedce00ff839 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -2289,13 +2289,11 @@ static struct folio *only_alloc_fresh_hugetlb_folio(struct hstate *h, > * pages is zero. > */ > static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h, > - gfp_t gfp_mask, int nid, nodemask_t *nmask, > - nodemask_t *node_alloc_noretry) > + gfp_t gfp_mask, int nid, nodemask_t *nmask) > { > struct folio *folio; > > - folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, > - node_alloc_noretry); > + folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL); > if (!folio) > return NULL; > > @@ -2513,7 +2511,7 @@ static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h, > goto out_unlock; > 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) > 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)) > 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) > 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; > > folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, > - &node_states[N_MEMORY], NULL); > + &node_states[N_MEMORY]); > if (!folio) > break; > free_huge_folio(folio); /* free it into the hugepage allocator */ Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
On Thu, May 16, 2024 at 10:10:35AM +0200, Oscar Salvador wrote: > Since commit d67e32f26713 ("hugetlb: restructure pool allocations"), > the parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() > is not used, so drop it. > > Signed-off-by: Oscar Salvador <osalvador@suse.de> Reviewed-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
> On May 16, 2024, at 16:10, Oscar Salvador <osalvador@suse.de> wrote: > > Since commit d67e32f26713 ("hugetlb: restructure pool allocations"), > the parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() > is not used, so drop it. > > Signed-off-by: Oscar Salvador <osalvador@suse.de> Reviewed-by: Muchun Song <muchun.song@linux.dev> Thanks.
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6be78e7d4f6e..fedce00ff839 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2289,13 +2289,11 @@ static struct folio *only_alloc_fresh_hugetlb_folio(struct hstate *h, * pages is zero. */ static struct folio *alloc_fresh_hugetlb_folio(struct hstate *h, - gfp_t gfp_mask, int nid, nodemask_t *nmask, - nodemask_t *node_alloc_noretry) + gfp_t gfp_mask, int nid, nodemask_t *nmask) { struct folio *folio; - folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, - node_alloc_noretry); + folio = __alloc_fresh_hugetlb_folio(h, gfp_mask, nid, nmask, NULL); if (!folio) return NULL; @@ -2513,7 +2511,7 @@ static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h, goto out_unlock; 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) 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)) 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) 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; folio = alloc_fresh_hugetlb_folio(h, gfp_mask, nid, - &node_states[N_MEMORY], NULL); + &node_states[N_MEMORY]); if (!folio) break; free_huge_folio(folio); /* free it into the hugepage allocator */
Since commit d67e32f26713 ("hugetlb: restructure pool allocations"), the parameter node_alloc_noretry from alloc_fresh_hugetlb_folio() is not used, so drop it. Signed-off-by: Oscar Salvador <osalvador@suse.de> --- mm/hugetlb.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)