From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f73.google.com (mail-ej1-f73.google.com [209.85.218.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4B7141B34E for ; Mon, 29 Jun 2026 13:12:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782738758; cv=none; b=jZkZkOyK2fcCvCNmVZhPZNp8z+TfHN8XWR0PQsI0sxoP5qltfw4+O+XbB9Gg812aNXDXM29cW5vI6c9ymuUAdOpWAztL42UUewve5i5FBXcBSzVFoZt9VmXXhCtoAspaja93lQTFE3P0hcWDzuUYvySWXXyiQCaEZvqtSu6bjs0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782738758; c=relaxed/simple; bh=Jd2xpnNcJCnVWO1WugDN2P0A+uNMGdLLZh7SbcJRwhU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WcoDFlZ5czvMF2o0YYDlRtc4uBR+VHfR2GEbYk9YlpM+4+Rbg6sPMMwa1uKzszWEZ2HqT1+dG0SRfXrojDbe6XKqOTwjCIcxYLsCfjR2EDsbaQD3phQh0vwmiAsJejok4Wxtg5Y7O6TIG5oQOckhGmRqsCgqQNRZeotqLd9H80c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=b4S3owA3; arc=none smtp.client-ip=209.85.218.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="b4S3owA3" Received: by mail-ej1-f73.google.com with SMTP id a640c23a62f3a-c1265eb65e9so108840566b.1 for ; Mon, 29 Jun 2026 06:12:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782738754; x=1783343554; darn=vger.kernel.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=JBAu5z1qpXLt1yVYTZOb/NZ4VE3m9FIqmIALTgVK9u0=; b=b4S3owA3QcaDK9kna1WNgodoexy3SUar1kd5M4aYAJ6NNSA02TvazrlFEWi9a78vxX a0h7vfSeHVWs9yE8Y4FhhZiT2KJMqnmgZEj/2jE/2FXSeqZn42AFJTeHiPGTQMptH5js sXexeVlMm0SGNE5deyEi0U/TSXd65XDvlH/TUuEdziyTminaYk7EMp9VcxNtnEuNyQVK mU0tEIrRSL/od65k4XLl0hkJ9gkG5Bf11j/Yf6dLE2Rvjytt1RlInzY+kCl7h7s4QC3L KdAbEKKgzHcBf7+I2WWzqG27ZVKa5ZF+4R8H2AE7JbHelI9Tt3mF/87w+WnvJtIzHZQF mOxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782738754; x=1783343554; 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=JBAu5z1qpXLt1yVYTZOb/NZ4VE3m9FIqmIALTgVK9u0=; b=VxQz866JtR5s3j1wIhnzzdcNauh6W0cbTrzlgI3rCbDuoh6ImKX7uRYuyocag98FLu fQSla2yHPpxQllqkgz03oan4QUTLY47hslHGTMQ4mveEYBauGDdcpFkorSYrfE7au+rs M9BVG0gfd9tWOoQKPCD0ixzGnwzerJOtxlM23X8lL1NNgiBog1gVv2nD4a8WunNyqezY z/7KKGE1laaIfDj1sUg9270m8Bargxq52vZ5iXcVaVz+yVAHT9bKRFfArMMyb7Vf59tf HToTlkTinSaGZuIKUICuN02DiboBGAHqr5WPH8q17Adn0HtpdaN1sV8ujZCSsjmyLsmc +HLA== X-Forwarded-Encrypted: i=1; AHgh+Ro2S4S3GokHmvIsm1/rhqaRI7jk/FGQ9cRXeBN1h3eo3G0DvIW4Ug4SoNhz/ANdCpREchoI+yhICbM/nMY=@vger.kernel.org X-Gm-Message-State: AOJu0Yw1uTO+6FNqtBmnTR3rZBapRvTFoCMPU3aJ5UiGy7HvndH4Q3bK NMKSa0v35eEB2GDLy3itevZ6hgXN45On7kIP013Q6m02EBSSmyg4XDFucF7S9JVgwQOFzmQsBDM BmO2aq9RWMWs1yg== X-Received: from ejdn16.prod.google.com ([2002:a17:906:1650:b0:c12:6c81:a8ab]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:c00b:b0:c12:80f5:d841 with SMTP id a640c23a62f3a-c1280f5df41mr35865866b.56.1782738754134; Mon, 29 Jun 2026 06:12:34 -0700 (PDT) Date: Mon, 29 Jun 2026 13:12:03 +0000 In-Reply-To: <20260629-alloc-trylock-v3-0-57bef0eadbc2@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260629-alloc-trylock-v3-0-57bef0eadbc2@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260629-alloc-trylock-v3-14-57bef0eadbc2@google.com> Subject: [PATCH v3 14/16] mm: Move __alloc_pages() to mm/page_alloc.h From: Brendan Jackman To: Andrew Morton , Vlastimil Babka , Suren Baghdasaryan , Michal Hocko , Johannes Weiner , Zi Yan , Muchun Song , Oscar Salvador , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Mike Rapoport , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Ying Huang , Alistair Popple , Hao Li , Christoph Lameter , David Rientjes , Roman Gushchin , Sebastian Andrzej Siewior , Clark Williams , Steven Rostedt Cc: "Harry Yoo (Oracle)" , Gregory Price , Johannes Weiner , Alexei Starovoitov , Matthew Wilcox , Hao Ge , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, Brendan Jackman Content-Type: text/plain; charset="utf-8" It's no longer used outside of mm/. Since this means __alloc_pages_noprof() is no longer visible from gfp.h, this also means moving the definition of alloc_pages_node_noprof into the .c file. Also remove references to this API from the documentation tree - referring to the specific function name was already questionable but now the function is not even public it definitely seems wrong. Signed-off-by: Brendan Jackman --- Documentation/admin-guide/cgroup-v1/cpusets.rst | 2 +- Documentation/admin-guide/mm/transhuge.rst | 2 +- include/linux/gfp.h | 16 +--------------- mm/page_alloc.c | 13 ++++++++++++- mm/page_alloc.h | 4 ++++ 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/Documentation/admin-guide/cgroup-v1/cpusets.rst b/Documentation/admin-guide/cgroup-v1/cpusets.rst index c7909e5ac1361..52a213aff04e5 100644 --- a/Documentation/admin-guide/cgroup-v1/cpusets.rst +++ b/Documentation/admin-guide/cgroup-v1/cpusets.rst @@ -284,7 +284,7 @@ take action. ==> Unless this feature is enabled by writing "1" to the special file /dev/cpuset/memory_pressure_enabled, the hook in the rebalance - code of __alloc_pages() for this metric reduces to simply noticing + code of the page allocator for this metric reduces to simply noticing that the cpuset_memory_pressure_enabled flag is zero. So only systems that enable this feature will compute the metric. diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentation/admin-guide/mm/transhuge.rst index 23f8d13c2629d..16f37135ed80d 100644 --- a/Documentation/admin-guide/mm/transhuge.rst +++ b/Documentation/admin-guide/mm/transhuge.rst @@ -761,7 +761,7 @@ compact_fail but failed. It is possible to establish how long the stalls were using the function -tracer to record how long was spent in __alloc_pages() and +tracer to record how long was spent in the page allocator and using the mm_page_alloc tracepoint to identify which allocations were for huge pages. diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 3bf55a5f9143e..4d57e9c0bf204 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -204,10 +204,6 @@ static inline void arch_free_page(struct page *page, int order) { } static inline void arch_alloc_page(struct page *page, int order) { } #endif -struct page *__alloc_pages_noprof(gfp_t gfp, unsigned int order, int preferred_nid, - nodemask_t *nodemask); -#define __alloc_pages(...) alloc_hooks(__alloc_pages_noprof(__VA_ARGS__)) - struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_nid, nodemask_t *nodemask); #define __folio_alloc(...) alloc_hooks(__folio_alloc_noprof(__VA_ARGS__)) @@ -272,17 +268,7 @@ struct folio *__folio_alloc_node_noprof(gfp_t gfp, unsigned int order, int nid) * prefer the current CPU's closest node. Otherwise node must be valid and * online. */ -static inline struct page *alloc_pages_node_noprof(int nid, gfp_t gfp_mask, - unsigned int order) -{ - if (nid == NUMA_NO_NODE) - nid = numa_mem_id(); - - VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES); - warn_if_node_offline(nid, gfp_mask); - - return __alloc_pages_noprof(gfp_mask, order, nid, NULL); -} +struct page *alloc_pages_node_noprof(int nid, gfp_t gfp_mask, unsigned int order); #define alloc_pages_node(...) alloc_hooks(alloc_pages_node_noprof(__VA_ARGS__)) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9cb3f1665b41b..026f33f217036 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5427,7 +5427,18 @@ struct page *__alloc_pages_noprof(gfp_t gfp, unsigned int order, set_page_refcounted(page); return page; } -EXPORT_SYMBOL(__alloc_pages_noprof); + +struct page *alloc_pages_node_noprof(int nid, gfp_t gfp_mask, unsigned int order) +{ + if (nid == NUMA_NO_NODE) + nid = numa_mem_id(); + + VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES); + warn_if_node_offline(nid, gfp_mask); + + return __alloc_pages_noprof(gfp_mask, order, nid, NULL); +} +EXPORT_SYMBOL(alloc_pages_node_noprof); struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_nid, nodemask_t *nodemask) diff --git a/mm/page_alloc.h b/mm/page_alloc.h index af83764788b96..2058cbdca56e7 100644 --- a/mm/page_alloc.h +++ b/mm/page_alloc.h @@ -244,6 +244,10 @@ struct page *alloc_frozen_pages_nolock_noprof(gfp_t gfp_flags, int nid, unsigned alloc_hooks(alloc_frozen_pages_nolock_noprof(__VA_ARGS__)) void free_frozen_pages_nolock(struct page *page, unsigned int order); +struct page *__alloc_pages_noprof(gfp_t gfp, unsigned int order, int preferred_nid, + nodemask_t *nodemask); +#define __alloc_pages(...) alloc_hooks(__alloc_pages_noprof(__VA_ARGS__)) + extern void zone_pcp_reset(struct zone *zone); extern void zone_pcp_disable(struct zone *zone); extern void zone_pcp_enable(struct zone *zone); -- 2.54.0