From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 624A83D7A01 for ; Mon, 3 Aug 2026 13:38:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785764285; cv=none; b=ID3kRfYzvCNgU28C0XFdMB2H4BKhSJjVFnc3DnbBS8eWn85teiBRGWCecLX1e94GIAQdAFLXrhlxIOfd1gpyNuymDXcLjbV/1uwcR8xQfzIEZEFBKKx4STBTZuVQ4qbazOxhzBD49It9IPOlA+AeRBxHJJi9YUNNd4WFsB/KKjg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785764285; c=relaxed/simple; bh=1sczfEuOl5XyE2+dFqSPsBh7HifK/3TttmuhFQr34MA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RAUGYRs5qqsUS9flqqqza9ddutrkNlJXSmcVYe+73lZz1Gr++5Fsc686MMFZVOySl34lDUPTuDPtxsoePbadQQL39ycsc8QNrbv66A3Ckyb+XHhke+Y+stZd9OLsl7DntdOYngusYUdHQc1aLq2K2LbP+XzPLM+WtzWdKnJ6M8w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OAr+9fs8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OAr+9fs8" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2C152C2BCF6; Mon, 3 Aug 2026 13:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1785764285; bh=1sczfEuOl5XyE2+dFqSPsBh7HifK/3TttmuhFQr34MA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=OAr+9fs88Eie5X83EVkqf8msca0QFAUS4awl9Z+/gyCptTS+0PPtzO/Xe5udWhr6R N+YCHIMuu041rNUZE2LJ29wC/xgjNk6QnysCXJfnAOrFQkz5eC+kjAjgVebsLRhV06 hS4RRuC4DX7Nqcer2D0IuPIcle1imYrWEfyplyO4lHqkE5acNdKCaUgt+TPOuSCdkb ZvGtfS+01R8N/uzsIlDF/spCFPrZvIOz5ax66Ti0b5j897D2AxgI2XsGqCwiZtDYkl 90MXLyR6wU5cya6A5gPBgAtlcstm0BqNgxHQRa6UMk2VlpttUj1XNfOiY+eI+49cNX p4bRmcXlWCpoQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 112C4C55838; Mon, 3 Aug 2026 13:38:05 +0000 (UTC) From: Ackerley Tng via B4 Relay Date: Mon, 03 Aug 2026 06:38:00 -0700 Subject: [PATCH v5 3/3] mm: hugetlb: Move mpol interpretation out of dequeue_hugetlb_folio_vma() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260803-hugetlb-mpol-interpretation-v5-3-af2b7089f8a9@google.com> References: <20260803-hugetlb-mpol-interpretation-v5-0-af2b7089f8a9@google.com> In-Reply-To: <20260803-hugetlb-mpol-interpretation-v5-0-af2b7089f8a9@google.com> To: Alistair Popple , Andrew Morton , Byungchul Park , David Hildenbrand , Gregory Price , Joshua Hahn , Matthew Brost , Muchun Song , Oscar Salvador , Rakie Kim , Ying Huang , Zi Yan , erdemaktas@google.com, fvdl@google.com, jiaqiyan@google.com, jthoughton@google.com, mhocko@kernel.org, michael.roth@amd.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterx@redhat.com, pratyush@kernel.org, rick.p.edgecombe@intel.com, rientjes@google.com, roman.gushchin@linux.dev, seanjc@google.com, shakeel.butt@linux.dev, shivankg@amd.com, vannapurve@google.com, yan.y.zhao@intel.com, Jason Gunthorpe Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Ackerley Tng X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1785764284; l=4241; i=ackerleytng@google.com; s=20260225; h=from:subject:message-id; bh=mxYJ9ZfIJDNqqNET+i798zl+eMXnvPpSjYi2l1OPxHE=; b=QivN7sN8I31WwiKn12XzM7zIcnCzCJFKMeumY1BlC2xQSYMVmWvVkTmcw5squW1hr8iXtI4B0 wOnsLFdhs81A9khAN94v1qQa86hSPfKdAOJ4qgacYrp7gCr0+NrP8kz X-Developer-Key: i=ackerleytng@google.com; a=ed25519; pk=sAZDYXdm6Iz8FHitpHeFlCMXwabodTm7p8/3/8xUxuU= X-Endpoint-Received: by B4 Relay for ackerleytng@google.com/20260225 with auth_id=649 X-Original-From: Ackerley Tng Reply-To: ackerleytng@google.com From: Ackerley Tng Move memory policy interpretation out of dequeue_hugetlb_folio_vma() and into alloc_hugetlb_folio() to separate reading and interpretation of memory policy from actual allocation. Also rename dequeue_hugetlb_folio_vma() to dequeue_hugetlb_folio_with_mpol() to remove association with vma and to align with alloc_buddy_hugetlb_folio_with_mpol(). This will later allow memory policy to be interpreted outside of the process of allocating a hugetlb folio entirely. This opens doors for other callers of the HugeTLB folio allocation function, such as guest_memfd, where memory may not always be mapped and hence may not have an associated vma. No functional change intended. Signed-off-by: Ackerley Tng Reviewed-by: James Houghton --- mm/hugetlb.c | 66 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 3a159de08a0b6..a11cb919e00fe 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1323,32 +1323,26 @@ struct mempolicy_interpreted { enum mempolicy_mode mode; }; -static struct folio *dequeue_hugetlb_folio_vma(struct hstate *h, - struct vm_area_struct *vma, - unsigned long address) +static struct folio *dequeue_hugetlb_folio(struct hstate *h, gfp_t gfp_mask, + struct mempolicy_interpreted *mpoli) { + nodemask_t *nodemask = mpoli->nodemask; struct folio *folio = NULL; - struct mempolicy *mpol; - gfp_t gfp_mask; - nodemask_t *nodemask; - int nid; - - gfp_mask = htlb_alloc_mask(h); - nid = huge_node(vma, address, gfp_mask, &mpol, &nodemask); - if (mpol_is_preferred_many(mpol)) { + if (mpoli->mode == MPOL_PREFERRED_MANY) { folio = dequeue_hugetlb_folio_nodemask(h, gfp_mask, - nid, nodemask); + mpoli->nid, + nodemask); /* Fallback to all nodes if page==NULL */ nodemask = NULL; } - if (!folio) + if (!folio) { folio = dequeue_hugetlb_folio_nodemask(h, gfp_mask, - nid, nodemask); - - mpol_cond_put(mpol); + mpoli->nid, + nodemask); + } return folio; } @@ -2855,7 +2849,11 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, int ret, idx; struct hugetlb_cgroup *h_cg = NULL; struct hugetlb_cgroup *h_cg_rsvd = NULL; + struct mempolicy_interpreted mpoli; gfp_t gfp = htlb_alloc_mask(h); + struct mempolicy *mpol; + nodemask_t *nodemask; + int nid; idx = hstate_index(h); @@ -2914,6 +2912,18 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, if (ret) goto out_uncharge_cgroup_reservation; + /* Takes reference on mpol. */ + nid = huge_node(vma, addr, gfp, &mpol, &nodemask); + mpoli = (struct mempolicy_interpreted){ + .nid = nid, +#ifdef CONFIG_NUMA + .mode = mpol ? mpol->mode : MPOL_DEFAULT, +#else + .mode = MPOL_DEFAULT, +#endif + .nodemask = nodemask, + }; + spin_lock_irq(&hugetlb_lock); /* @@ -2925,35 +2935,23 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, */ folio = NULL; if (!gbl_chg || available_huge_pages(h)) - folio = dequeue_hugetlb_folio_vma(h, vma, addr); + folio = dequeue_hugetlb_folio(h, gfp, &mpoli); if (!folio) { - struct mempolicy_interpreted mpoli; - struct mempolicy *mpol; - nodemask_t *nodemask; - int nid; - spin_unlock_irq(&hugetlb_lock); - nid = huge_node(vma, addr, gfp, &mpol, &nodemask); - mpoli = (struct mempolicy_interpreted){ - .nid = nid, -#ifdef CONFIG_NUMA - .mode = mpol ? mpol->mode : MPOL_DEFAULT, -#else - .mode = MPOL_DEFAULT, -#endif - .nodemask = nodemask, - }; folio = alloc_buddy_hugetlb_folio(h, gfp, &mpoli); - mpol_cond_put(mpol); - if (!folio) + if (!folio) { + mpol_cond_put(mpol); goto out_uncharge_cgroup; + } spin_lock_irq(&hugetlb_lock); list_add(&folio->lru, &h->hugepage_activelist); folio_ref_unfreeze(folio, 1); /* Fall through */ } + mpol_cond_put(mpol); + /* * Either dequeued or buddy-allocated folio needs to add special * mark to the folio when it consumes a global reservation. -- 2.55.0.508.g3f0d502094-goog