mm-hugetlb-fix-hugetlb-cgroup-rsvd-charge-uncharge-mismatch.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: fix hugetlb cgroup rsvd charge/uncharge mismatch
has been removed from the -mm tree. Its filename was
mm-hugetlb-fix-hugetlb-cgroup-rsvd-charge-uncharge-mismatch.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: Deepanshu Kartikey <[email protected]>
Subject: mm/hugetlb: fix hugetlb cgroup rsvd charge/uncharge mismatch
Date: Sat, 28 Mar 2026 12:25:34 +0530
In alloc_hugetlb_folio(), a single h_cg pointer is used for both the rsvd and non-rsvd hugetlb cgroup charges. When map_chg is set, hugetlb_cgroup_charge_cgroup_rsvd() stores the charged cgroup in h_cg, but the immediately following hugetlb_cgroup_charge_cgroup() overwrites h_cg with the non-rsvd cgroup pointer.
As a result, hugetlb_cgroup_commit_charge_rsvd() stores the wrong (non-rsvd) cgroup pointer into the folio's rsvd slot.
When the folio is later freed, free_huge_folio() unconditionally calls both hugetlb_cgroup_uncharge_folio() and hugetlb_cgroup_uncharge_folio_rsvd(). The rsvd uncharge reads back the wrong cgroup from the folio and decrements a counter that was never charged for that cgroup, causing a page_counter underflow:
page_counter underflow: -512 nr_pages=512
WARNING: mm/page_counter.c:61 at page_counter_cancel
Fix this by introducing a separate h_cg_rsvd pointer exclusively for the rsvd charge path, keeping the rsvd and non-rsvd charges fully independent through their charge, commit, and error uncharge paths.
---
mm/hugetlb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-fix-hugetlb-cgroup-rsvd-charge-uncharge-mismatch +4 -3
@@ -2859,6 +2859,7 @@ struct folio *alloc_hugetlb_folio(structmap_chg_state map_chg;int ret, idx;struct hugetlb_cgroup *h_cg =NULL ; +struct hugetlb_cgroup *h_cg_rsvd =NULL ;gfp_t gfp =htlb_alloc_mask (h) | __GFP_RETRY_MAYFAIL; idx =hstate_index (h);
@@ -2909,7 +2910,7 @@ struct folio *alloc_hugetlb_folio(struct*/ if (map_chg) { ret =hugetlb_cgroup_charge_cgroup_rsvd ( - idx,pages_per_huge_page (h), &h_cg); + idx,pages_per_huge_page (h), &h_cg_rsvd);if (ret) goto out_subpool_put; }
@@ -2951,7 +2952,7 @@ struct folio *alloc_hugetlb_folio(struct*/ if (map_chg) {hugetlb_cgroup_commit_charge_rsvd (idx,pages_per_huge_page (h), - h_cg, folio); + h_cg_rsvd, folio); }spin_unlock_irq (&hugetlb_lock);
@@ -3003,7 +3004,7 @@ out_uncharge_cgroup: out_uncharge_cgroup_reservation:if (map_chg)hugetlb_cgroup_uncharge_cgroup_rsvd (idx,pages_per_huge_page (h), - h_cg); + h_cg_rsvd); out_subpool_put:/* * put page to subpool iff the quota of subpool's rsv_hpages is used
_
Patches currently in -mm which might be from [email protected] are