Re: [PATCH 04/15] mm/hugetlb: account temporary folios separately

From: David Hildenbrand (Arm)

Date: Mon Nov 02 2026 - 07:57:11 EST


On 10/28/26 21:13, David Hildenbrand (Arm) wrote:
> Hugetlb migration might have to allocate a temporary folio through
> alloc_migrate_hugetlb_folio(). Such folios are currently accounted in
> "nr_huge_pages" but not in "surplus_huge_pages". persistent_huge_pages()
> can mistake them as persistent huge pages, as it merely calculates the
> difference.
>
> If set_max_huge_pages() shrinks the pool at the wrong time, it will turn
> hugetlb folios into surplus folios until persistent_huge_pages() returns
> the desired number.
>
> After the migration (successful or unsuccessful) either the new (temporary)
> folio or the old folio gets freed: this will reduce "nr_huge_pages" but
> not "surplus_huge_pages", to undo what was done when allocating a
> temporary folio.
>
> This can result in having more surplus folios than actually allocated
> folios:
>
> HugePages_Total: 0
> HugePages_Surp: 1
>
> From then on persistent_huge_pages() returns garbage.
>
> To fix it, add internal temporary counters and subtract them when
> calculating persistent pool sizes. Update persistent_huge_pages() and add
> persistent_huge_pages_node() to make the code easier to read.
>
> Count migration targets and rejected surplus allocations as temporary.
> Transfer the per-node temporary count along with the temporary flag on
> migration, such that folio freeing will always do the right thing.
>
> Take care of calling account_new_hugetlb_folio() only after setting the
> folios to be temporary.
>
> For now, keep temporary folios in nr_huge_pages, so HugePages_Total and
> Hugetlb continue to include them and overcommit accounting remains
> unchanged. The new temporary counters are internal for now and are not
> exported to userspace.
>
> Fixes: ab5ac90aecf5 ("mm, hugetlb: do not rely on overcommit limit during migration")
> Cc: stable@xxxxxxxxxx
> Reported-by: Josef Bacik <josef@xxxxxxxxxxxxxx>
> Signed-off-by: David Hildenbrand (Arm) <david@xxxxxxxxxx>
> ---
> include/linux/hugetlb.h | 3 +++
> mm/hugetlb.c | 65 +++++++++++++++++++++++++++++--------------------
> 2 files changed, 42 insertions(+), 26 deletions(-)
>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index 5029c7241863..d49cb15d13e6 100644
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -701,6 +701,8 @@ struct hstate {
> unsigned long free_huge_pages;
> unsigned long resv_huge_pages;
> unsigned long surplus_huge_pages;
> + /* Included in nr_huge_pages; not exported separately to userspace. */
> + unsigned long temporary_huge_pages;
> unsigned long nr_overcommit_huge_pages;
> struct list_head hugepage_activelist;
> struct list_head hugepage_freelists[MAX_NUMNODES];
> @@ -708,6 +710,7 @@ struct hstate {
> unsigned int nr_huge_pages_node[MAX_NUMNODES];
> unsigned int free_huge_pages_node[MAX_NUMNODES];
> unsigned int surplus_huge_pages_node[MAX_NUMNODES];
> + unsigned int temporary_huge_pages_node[MAX_NUMNODES];
> char name[HSTATE_NAME_LEN];
> };
>
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index a78b2487c20c..110a5c2d9e50 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -115,7 +115,7 @@ early_param(str, func##args)
>
> /*
> * Protects updates to hugepage_freelists, hugepage_activelist, nr_huge_pages,
> - * free_huge_pages, and surplus_huge_pages.
> + * free_huge_pages, surplus_huge_pages, and temporary_huge_pages.
> */
> __cacheline_aligned_in_smp DEFINE_SPINLOCK(hugetlb_lock);
>
> @@ -1337,7 +1337,13 @@ static unsigned long available_huge_pages(struct hstate *h)
>
> static unsigned long persistent_huge_pages(struct hstate *h)
> {
> - return h->nr_huge_pages - h->surplus_huge_pages;
> + return h->nr_huge_pages - h->surplus_huge_pages - h->temporary_huge_pages;
> +}
> +
> +static unsigned long persistent_huge_pages_node(struct hstate *h, int nid)
> +{
> + return h->nr_huge_pages_node[nid] - h->surplus_huge_pages_node[nid] -
> + h->temporary_huge_pages_node[nid];
> }

I'll also use const pointer here.

--
Cheers,

David