From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F481C3ABDA for ; Wed, 14 May 2025 23:44:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 961508D0002; Wed, 14 May 2025 19:43:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E7848D0001; Wed, 14 May 2025 19:43:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7154F8D0002; Wed, 14 May 2025 19:43:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4D11C8D0001 for ; Wed, 14 May 2025 19:43:28 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 8F972E2BC6 for ; Wed, 14 May 2025 23:43:29 +0000 (UTC) X-FDA: 83443142538.09.953FDFE Received: from mail-pf1-f201.google.com (mail-pf1-f201.google.com [209.85.210.201]) by imf15.hostedemail.com (Postfix) with ESMTP id C8943A0007 for ; Wed, 14 May 2025 23:43:27 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KIOW27Tt; spf=pass (imf15.hostedemail.com: domain of 3niolaAsKCM8vx5zC6zJE8119916z.x97638FI-775Gvx5.9C1@flex--ackerleytng.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=3niolaAsKCM8vx5zC6zJE8119916z.x97638FI-775Gvx5.9C1@flex--ackerleytng.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266207; a=rsa-sha256; cv=none; b=yNw+2+OlozF7C7PYPH/E4IjR5y9917rCWU4hY6/mUAx/4lYi9FafITzEzohZos1XH2m5Iy fQyJbBv2vXZLdqYguFpyjuHNJXQsIU5Ruk3uCgcjJz0OHA1ReFGME+fDIY5zvnlDwjazEk 643NRMMnl3IyfRN3/oT7UES3XCKZMwI= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KIOW27Tt; spf=pass (imf15.hostedemail.com: domain of 3niolaAsKCM8vx5zC6zJE8119916z.x97638FI-775Gvx5.9C1@flex--ackerleytng.bounces.google.com designates 209.85.210.201 as permitted sender) smtp.mailfrom=3niolaAsKCM8vx5zC6zJE8119916z.x97638FI-775Gvx5.9C1@flex--ackerleytng.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266207; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5oaNONcPwTQNIIHvMztjnu28D1ASTydoh1/NvmmsKm4=; b=y2doKhn2lmdUj71mB2GBGeQ5W0BQRNjCJj507J2OqHGOwwIB81VGumRcfPfH6rQsv9Hr4c bDcKADhGa9hWWImt+aaXECTPo1EY/qwytupGMO/H7Q3pLh58Az272QYxV4XojM86OE6OMM WDMKxLkYxjUPwYk+CG5bY9ToimjFhjI= Received: by mail-pf1-f201.google.com with SMTP id d2e1a72fcca58-74243ab539dso281330b3a.3 for ; Wed, 14 May 2025 16:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266207; x=1747871007; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5oaNONcPwTQNIIHvMztjnu28D1ASTydoh1/NvmmsKm4=; b=KIOW27TtcEPnlFr7nDtvsH1BySaqUv6TUk3NgmQFMKfOmsiq7jm/m5O/C9hLd61++z 50gTOZMYELiCvZ5OC4eYhAuyFjXoy0VtT04ZdGPBO+IlRqOrRCblOLcB6OGZQxlzVFda RsI7FRlk2Ov4Q7wnPGQh00aLeipKV7C/Zy4v7wHDFYACXvM4ampQSLy9FyKz+V9xW4qi zkc20tjwGgCbtNvrC/nmIH3mpCi/ySpx7rIGRF1RUWR468wZCPwGW5viOdQitXdb15NR vJxnWYDqIEgeFCOYeCd9dp7oDYOeoQrSuaeb8IV284831Koo1iSHfaAts53KdIaxp4Id d+iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266207; x=1747871007; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5oaNONcPwTQNIIHvMztjnu28D1ASTydoh1/NvmmsKm4=; b=guKOX5ljjCuRsRcIYKGoUR5kGxz8sel+EUxcUSWVxQtg1b1mCapxIpJ3BQKAtYw6R0 JtbMamDTqaAEYSG60LLIXxjdKD6cC/D53lWp/Nu30jFQy1K5d10a6wEy31yYZ3ipMpLd 6zvU22nwZvveqTLpb6MehMxzkw/z4ApLun0SHdhErI4oMFl/G2a8utZnNv8skCzWSPZ1 kJs0Rn7II5TEVeyNvN1mR5sP/g29+1ekpXUHQzOtB0YPKZAzW7IyOF9f9PNaWFKaElQ6 LpoXAWs6Dwz791VoKYZyYi0tCMQKSmwjAcpwbx9UIScSfqgvrslaZKaDeh0CPLo0RUxE 6v7w== X-Forwarded-Encrypted: i=1; AJvYcCV4KPfpvmj6iVHKr924B2uqsmqX2KAOGW2OQaLtm9RqtJH8uz5mQfKrONVONfZp85L/85r85kCeFQ==@kvack.org X-Gm-Message-State: AOJu0YwZjr6FFwG6tQZc5929P2VzqKb4CWvdgM5lNg4ZA4rwuxo8v2e3 QuoTfOhQ+vcHJZP5mTP6fzC8rJ/qwrEEofFJUoI/IX7p8ZwRohoq/WIdg//7x2mtKKod+V33v50 IMZ1BRDqhs5G+uxHdeflScw== X-Google-Smtp-Source: AGHT+IFDw6Fhs5VsEhgFA8tXL8E4i6uAaDFqGq3lNYpfsvbH4tE4uhaRVHc3Hip3C1CIUzADwan554jzbkPTgKA3mg== X-Received: from pgbfm8.prod.google.com ([2002:a05:6a02:4988:b0:b0b:301e:8e96]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:6005:b0:1f5:82ae:69d1 with SMTP id adf61e73a8af0-215ff1254b5mr7372409637.20.1747266206677; Wed, 14 May 2025 16:43:26 -0700 (PDT) Date: Wed, 14 May 2025 16:41:58 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <66aa28f888e392f7039de1c20ef854fb05a3c839.1747264138.git.ackerleytng@google.com> Subject: [RFC PATCH v2 19/51] mm: hugetlb: Rename alloc_surplus_hugetlb_folio From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com Content-Type: text/plain; charset="UTF-8" X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: C8943A0007 X-Stat-Signature: kzcodhicckkq3higo7jocmfhud66fkko X-HE-Tag: 1747266207-535130 X-HE-Meta: U2FsdGVkX1++3hSxyPXFyWVs2LgHJZ+MeYmMjjSBafZz73cSSJNFE7sK63XZT1d+/F82yIy8SY+CitzmfBzPM+dSUlHZXES34XCFkv3CMggRotx5PPzUCo7SZaYhp2/nSG+gLOfTFPWaFyctyKhb3p5/RdOLJPqsPW1Hhe0jVunIUm4UhFPVDDobxD7hOlyIGNjplXViwv8kYG+bXtihW/yUE3/RUAMiuET74fUH1RAqJ73Vze+hYQui3FLA3cd5oPWyXTGAbVetN0mSyPijYsRjzgHkvPOhQvGG26eFlAQLJNWNnYoF26UdGaOlL01HSpEMB3PKGBvXUZpc8sO0DzT7bh00c59Kro0QJT/fIeqHxHvAoUdMoIw4KaHkHdxCcnWT0URL2++/BC1iKhfSU4L2T+bqaoQCiXywEmLk6ZOVmMVtad3Pe1kLNNFlkN9c+GkbJ3rZghPQ9Pzj5NFdWR2zAa64C0QEuYXblcXZAFdOGEH5DziZRc1XLLG4a2rrfErByFPvJBsEjCC6KnTVRqkrWn4UnVy0+YIt4qUoPmfyuU5yNrYW0XwRHTHbrNv5w20T9/t6I//bGys5EH//SAOWCrLrEhjA9v0vBGmMXbLYApgyMb6pIGwzzfBRuwwqBQrLG8C7hjwd2D0q+oyk4rvwMYpfI8nF1SuHujWKJdUb0CmmkTfjZXMoxPopnVoZushJDvZqcf46JZBqF8GydJr6iPbK1RyUUNkJgsZujFB0AUvvNMJxd/gylm+VhdD7h8D7MVf93r3LDyBtIYhHP4fnUJSVeTW4AOOfuDs4iwgzWeVP3iV74hzzAIhbyVEzWCdaw02CJAy9oE6L0ZOpDby61qvGhhwQX+vauZfnQ+Aqk9j6yj1UkOFeq16XLlE5EVB8az9L0XTSK6ILaPUf5o5PfpnGNKb0g1aVNJyjWjaM11iBRP1tcWpRLc0UOwRuneIQ2H1gdCQPAdpisH8 Mc63qxCf yr/9dJpi6DvS+BMQazLel3OVtDpFiJWS7dOwinVNgHt9Zu33R1kI8USObNBgmbGQnFCjlFO0k2+G2rnI6RkJi4Z/JAh3W33i1PskASF2cuJq3ZZV3FDcyd9RTs4uXVjkh32Ka31TRverUXWeMnWB5vBM7tZ4BYmJx57seYZRk76siYQFe1b4woXwfs8yiSE7++bzlmCLX7L1FpVZN0/RtidEI1zN+7TKXkpLjYzL7MI6a65AUiVR6vIskTgmwkKIZvZ+nMdHykFdrt4e9AfCKKxI2lDJ39a5ef4PdXB8zfO2I7mU+sDUPl+xWcJcWANl1cqguO7TG1GUohFqDsOArtqQLuzauVqmXRpKqUA2glBiItzn7fCP3hhgdZJmS8kM7Trb1PMQaLVN+6nYRDP7ZyTvkW5EcbPYRJD9KYm46zT/1vzc7iQgVYgvvdvdllo7TVmtfwjA/A14rIwbYvaN+cJ5Bc3q9iHkPq9BiLHSaZM58NcYjXfK/qn3vBJYbP7TUgFJJP+QxKoyydXh0iSEuoxtM+31LIvdZcXL2rhCE95KLB/ajd58tBAxil+TeEtrEhp4v7PoqYEL+9mJxRDVdbyxhmTcnJCoWIZnVkvZF1RgT4C6QWyHWPXJyVSnujOvhVqXvXir/4/f4Fbr1bEkyQA97Am36jBoKCNP02fUeu4paTh96HqK8iOFJJTwUqeZgG/kV X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Rename alloc_surplus_hugetlb_folio vs alloc_surplus_hugetlb_folio_nodemask to align with dequeue_hugetlb_folio vs dequeue_hugetlb_folio_nodemask. Signed-off-by: Ackerley Tng Change-Id: I38982497eb70aeb174c386ed71bb896d85939eae --- mm/hugetlb.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 67144af7ab79..b822b204e9b3 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2236,7 +2236,7 @@ int dissolve_free_hugetlb_folios(unsigned long start_pfn, unsigned long end_pfn) /* * Allocates a fresh surplus page from the page allocator. */ -static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h, +static struct folio *alloc_surplus_hugetlb_folio_nodemask(struct hstate *h, gfp_t gfp_mask, int nid, nodemask_t *nmask) { struct folio *folio = NULL; @@ -2312,9 +2312,9 @@ static struct folio *alloc_migrate_hugetlb_folio(struct hstate *h, gfp_t gfp_mas /* * Use the VMA's mpolicy to allocate a huge page from the buddy. */ -static -struct folio *alloc_buddy_hugetlb_folio_with_mpol(struct hstate *h, - struct vm_area_struct *vma, unsigned long addr) +static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h, + struct vm_area_struct *vma, + unsigned long addr) { struct folio *folio = NULL; struct mempolicy *mpol; @@ -2326,14 +2326,14 @@ struct folio *alloc_buddy_hugetlb_folio_with_mpol(struct hstate *h, if (mpol_is_preferred_many(mpol)) { gfp_t gfp = gfp_mask & ~(__GFP_DIRECT_RECLAIM | __GFP_NOFAIL); - folio = alloc_surplus_hugetlb_folio(h, gfp, nid, nodemask); + folio = alloc_surplus_hugetlb_folio_nodemask(h, gfp, nid, nodemask); /* Fallback to all nodes if page==NULL */ nodemask = NULL; } if (!folio) - folio = alloc_surplus_hugetlb_folio(h, gfp_mask, nid, nodemask); + folio = alloc_surplus_hugetlb_folio_nodemask(h, gfp_mask, nid, nodemask); mpol_cond_put(mpol); return folio; } @@ -2435,14 +2435,14 @@ static int gather_surplus_pages(struct hstate *h, long delta) /* Prioritize current node */ if (node_isset(numa_mem_id(), alloc_nodemask)) - folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h), + folio = alloc_surplus_hugetlb_folio_nodemask(h, htlb_alloc_mask(h), numa_mem_id(), NULL); if (!folio) { for_each_node_mask(node, alloc_nodemask) { if (node == numa_mem_id()) continue; - folio = alloc_surplus_hugetlb_folio(h, htlb_alloc_mask(h), + folio = alloc_surplus_hugetlb_folio_nodemask(h, htlb_alloc_mask(h), node, NULL); if (folio) break; @@ -3055,7 +3055,7 @@ struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, if (!folio) { spin_unlock_irq(&hugetlb_lock); - folio = alloc_buddy_hugetlb_folio_with_mpol(h, vma, addr); + folio = alloc_surplus_hugetlb_folio(h, vma, addr); if (!folio) goto out_uncharge_cgroup; spin_lock_irq(&hugetlb_lock); @@ -3868,11 +3868,12 @@ static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid, * First take pages out of surplus state. Then make up the * remaining difference by allocating fresh huge pages. * - * We might race with alloc_surplus_hugetlb_folio() here and be unable - * to convert a surplus huge page to a normal huge page. That is - * not critical, though, it just means the overall size of the - * pool might be one hugepage larger than it needs to be, but - * within all the constraints specified by the sysctls. + * We might race with alloc_surplus_hugetlb_folio_nodemask() + * here and be unable to convert a surplus huge page to a normal + * huge page. That is not critical, though, it just means the + * overall size of the pool might be one hugepage larger than it + * needs to be, but within all the constraints specified by the + * sysctls. */ while (h->surplus_huge_pages && count > persistent_huge_pages(h)) { if (!adjust_pool_surplus(h, nodes_allowed, -1)) @@ -3930,10 +3931,11 @@ static int set_max_huge_pages(struct hstate *h, unsigned long count, int nid, * By placing pages into the surplus state independent of the * overcommit value, we are allowing the surplus pool size to * exceed overcommit. There are few sane options here. Since - * alloc_surplus_hugetlb_folio() is checking the global counter, - * though, we'll note that we're not allowed to exceed surplus - * and won't grow the pool anywhere else. Not until one of the - * sysctls are changed, or the surplus pages go out of use. + * alloc_surplus_hugetlb_folio_nodemask() is checking the global + * counter, though, we'll note that we're not allowed to exceed + * surplus and won't grow the pool anywhere else. Not until one + * of the sysctls are changed, or the surplus pages go out of + * use. * * min_count is the expected number of persistent pages, we * shouldn't calculate min_count by using -- 2.49.0.1045.g170613ef41-goog