mm-hugetlb-unify-restore-reserve-accounting-for-new-allocations.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: unify restore reserve accounting for new allocations
has been removed from the -mm tree. Its filename was
mm-hugetlb-unify-restore-reserve-accounting-for-new-allocations.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: Peter Xu <[email protected]>
Subject: mm/hugetlb: unify restore reserve accounting for new allocations
Date: Tue, 7 Jan 2025 15:40:02 -0500
Either hugetlb pages dequeued from hstate, or newly allocated from buddy, would require restore-reserve accounting to be managed properly. Merge the two paths on it. Add a small comment to make it slightly nicer.
---
mm/hugetlb.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-unify-restore-reserve-accounting-for-new-allocations +9 -9
@@ -1365,11 +1365,6 @@ static struct folio *dequeue_hugetlb_fol folio =dequeue_hugetlb_folio_nodemask (h, gfp_mask, nid, nodemask); -if (folio && !gbl_chg) { -folio_set_hugetlb_restore_reserve (folio); - h->resv_huge_pages--; - } -mpol_cond_put (mpol);return folio;
@@ -3056,15 +3051,20 @@ struct folio *alloc_hugetlb_folio(structif (!folio) goto out_uncharge_cgroup;spin_lock_irq (&hugetlb_lock); -if (!gbl_chg) { -folio_set_hugetlb_restore_reserve (folio); - h->resv_huge_pages--; - }list_add (&folio->lru, &h->hugepage_activelist);folio_ref_unfreeze (folio,1 );/* Fall through */ } +/* +* Either dequeued or buddy-allocated folio needs to add special +* mark to the folio when it consumes a global reservation. +*/ +if (!gbl_chg) { +folio_set_hugetlb_restore_reserve (folio); + h->resv_huge_pages--; + } +hugetlb_cgroup_commit_charge (idx,pages_per_huge_page (h), h_cg, folio);/* If allocation is not consuming a reservation, also store the * hugetlb_cgroup pointer on the page.
_
Patches currently in -mm which might be from [email protected] are