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 CF24B3ED5A4 for ; Wed, 6 May 2026 15:54:47 +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=1778082887; cv=none; b=uj1S4K1Oyhb2FAjXSExch5wXZgEVZidhG2pnTZXYjAU4ribtZ4X9rAPS3CvGd8COoF3LYcbY6KG0sZWIACujSbo0IneWz72arcNiKuRr3/YvdG2va1mmW5Hu5gnI6hbtR6BsqmQCBL6biVtPd/WGzLn5Ri+SwC/oMV1a9w34vOk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778082887; c=relaxed/simple; bh=MTAqXqjU1haYCX3aL6jCZ5kr7+TwMGVT8o6E66wbHEw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FIrcBAbERUwUKQjUF5xAqTwDMrPNNfU18iKALVN+/bq7v3sdj+kq3ILW7MJF8s1UH04K9NSYUSmfmlPscw/O31/j8Av925wpudPHOPRJUmhUsuBExhEmFxhromRz2wXBUZTmRd8nxRZqOeTt9jGmBMJr5WpKIaDK2evvgSLV+B0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Spy2fGUa; 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="Spy2fGUa" Received: by smtp.kernel.org (Postfix) with ESMTPS id 8589EC4AF10; Wed, 6 May 2026 15:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778082887; bh=MTAqXqjU1haYCX3aL6jCZ5kr7+TwMGVT8o6E66wbHEw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Spy2fGUaj609nhPpwatopMmHdK8eVklmI2H0UvK27zGUzJjsmAD6P6C/4FfQ4/nzb 7Yge0qfDp2zwOejFgfgs4f2S3DD1UmRA/Tdi8r2B6R503D1LWasVDnTCm3b/qcha9z 6ENjWJA6tT+OjegIKwHMWM4EkWRdWB6MT54dw/raCw+OKT7AULGJzfKFwQhv6Hz+xS UY/WjNeBt8GrmZSc/aCO4GROsN5u2wq44sE1vh3jOrDZwLM+gjUyCnncv3XewFMhgJ zp3hBlpQ5W6sEGQkXWy+08WleFIun1POXV2x3po0wZyRCKccUXIIojhorX1WWm+4f2 owEjzjDqIMELA== 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 7D4FECD3443; Wed, 6 May 2026 15:54:47 +0000 (UTC) From: Ackerley Tng via B4 Relay Date: Wed, 06 May 2026 08:54:40 -0700 Subject: [PATCH v2 4/6] mm: hugetlb: Use error variable in alloc_hugetlb_folio 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: <20260506-hugetlb-open-up-v2-4-826a0c5f28fc@google.com> References: <20260506-hugetlb-open-up-v2-0-826a0c5f28fc@google.com> In-Reply-To: <20260506-hugetlb-open-up-v2-0-826a0c5f28fc@google.com> To: Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton , fvdl@google.com, jiaqiyan@google.com, joshua.hahnjy@gmail.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, Dan Williams , Jason Gunthorpe Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ackerley Tng X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778082886; l=2128; i=ackerleytng@google.com; s=20260225; h=from:subject:message-id; bh=eGP3URO25a2yJfXjXfljDSZfxvkXYHSvdYeyD7MI+ek=; b=7RdhDIfpu2hRHtT21qfwETAVWbSePUPaxz9JrwOIiwwAWtPE6ipWXGpk2G8+NkmVEBhRnCSRm dv6BvSt6FHdDvL8xQXod9qkE63QOT2QnsHlTzCbxf64nENwkYBB79re 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 Refactor alloc_hugetlb_folio to use a local variable for returning error codes. Instead of returning ERR_PTR(-ENOSPC) at the end of the error path, assign -ENOSPC to a return variable at each failure point and return that variable at the end. This allows the cleanup goto targets to be used with other errors in a later patch. No functional change intended. Signed-off-by: Ackerley Tng --- mm/hugetlb.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 3395de4d0999a..68c21305fc86a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2894,8 +2894,10 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, */ if (map_chg) { gbl_chg = hugepage_subpool_get_pages(spool, 1); - if (gbl_chg < 0) + if (gbl_chg < 0) { + ret = -ENOSPC; goto out_end_reservation; + } } else { /* * If we have the vma reservation ready, no need for extra @@ -2911,13 +2913,17 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, if (map_chg) { ret = hugetlb_cgroup_charge_cgroup_rsvd( idx, pages_per_huge_page(h), &h_cg); - if (ret) + if (ret) { + ret = -ENOSPC; goto out_subpool_put; + } } ret = hugetlb_cgroup_charge_cgroup(idx, pages_per_huge_page(h), &h_cg); - if (ret) + if (ret) { + ret = -ENOSPC; goto out_uncharge_cgroup_reservation; + } spin_lock_irq(&hugetlb_lock); @@ -2938,6 +2944,7 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, folio = alloc_buddy_hugetlb_folio_with_mpol(h, mpol, nid, nodemask); if (!folio) { mpol_cond_put(mpol); + ret = -ENOSPC; goto out_uncharge_cgroup; } spin_lock_irq(&hugetlb_lock); @@ -3030,7 +3037,7 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, out_end_reservation: if (map_chg != MAP_CHG_ENFORCED) vma_end_reservation(h, vma, addr); - return ERR_PTR(-ENOSPC); + return ERR_PTR(ret); } static __init void *alloc_bootmem(struct hstate *h, int nid, bool node_exact) -- 2.54.0.545.g6539524ca2-goog