From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) (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 4906F3A2574 for ; Mon, 22 Jun 2026 10:01:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122524; cv=none; b=C1XgvCqvMVeuQ2//W9bdMrgdR/e7S+IjAmOuQ0eN3DbsWmEhx9898CZYxgOXjVROZ5fSHPUu8ZaLpR/Wp+bjfgpZkkMQpdZAo0Pfo7KuCgdBElMnTuIr5WciV3Dr9KeODFiv+a1DAWJXtxz0X09ZjqKW3e62euPrNxVie2izb0I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122524; c=relaxed/simple; bh=qN0Xs4C8ZeZVlsVBF6rIjAULLE8cWjNyo7/3Tdx+cpQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=LFKJ9P4A42Gc/3//Otmd01aSsfPp0xsuJBnNUQJ0Xshf582wu2f1z9Qv1QfbwQpY7Wdz4Aocoe3rzIen9uUANKaeEZS4pR+jEj6m5182wSSZmvE0OECC929i8NRb76BlJl86fqFyyXu2X9rZeLKWvArQIbq/Q40asDl/+6QmHyE= 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=OBVlyehn; arc=none smtp.client-ip=209.85.128.74 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="OBVlyehn" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-49246459bc4so15907605e9.2 for ; Mon, 22 Jun 2026 03:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782122516; x=1782727316; 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=9FrPB48FwcDezsnLpR3fJd40Qt1udKU6vCDBpIqP+Xw=; b=OBVlyehnMTQ1JobjybmR3iM6/NcG3RhLS53pugM18/PQ47KdDrz642SXd642Vlzyjp Mr9N8Q6o4YeI30AdALSrLHYy/v3xrlPx0jk+0yi7CCW+OdjfxcHK0P8ww/CAFGSBOEMc 7QsRmQdKP8xrrHfdNYdbhI9/BHWWsTpD28nLyVbtuJXadivUEtu2o7aryCCYmrAWFERn euL5Sdo01SVQVEmfGgT5Y7togp94l9IJTwZHXoONiIztygCINxpdarx7wtLtativInbG bDYK8E+N9V3EjkVzXiFghq2LTlJKc84iXJxtZC3/L9uk8bzQhpC6f18dZtbuJfAd9Alt Rr8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782122516; x=1782727316; 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=9FrPB48FwcDezsnLpR3fJd40Qt1udKU6vCDBpIqP+Xw=; b=Sk8kSa3x4a9fkGdXQbsmECUyi6MeBQI9RcBY5bXtRJ769/KmMJEhM1wzXktLV/5uGc vBoxJ1ScZ2HbtmCCGJKtm5BbhJzbWi4S0gtdkDTCLMTFOseVykLxq7zRPuFgUU94SANc u6XSAYTVyahveDHIqPwixyUQA76ICxs1vjHNLnq3bX8OMf8mGolIKn5B2s8OQoynj+M4 cpo2ck/9nV1adqgs4a2+kcENUyE9lRqDR+Mhku/bc33l+iTK+pBsh/UyOuUnXUeQnhYt +3+0cnQOll7XGmxAfhY2ZcnshjkzyfN/xhfadbdpOnDcePgSYNOoHWJJi3uvkKUHM4xd WrMQ== X-Forwarded-Encrypted: i=1; AFNElJ/ECkfKVOV03zl/p+nfIvsZH+beFhkkyGNvHZhSJbG08XZqS1j7qFtdYCvIoKmVMkYm6rOQpjlYDS5+S+4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3J/I3wjwLbMfxb5zjnSvPiE7lo1XfTQljJp1gX3WQ2tg24fTI MBNOiuJJLEhLN/oj0INCv9MF27/rF5GPwb18izlSYDpVcssazUX78VCABFx1qTmDlDTW/I9GlWN zLPZtUZBOUQBJgA== X-Received: from wmbe25.prod.google.com ([2002:a05:600c:5919:b0:490:7229:9747]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1f92:b0:490:a1dc:e542 with SMTP id 5b1f17b1804b1-49242314217mr179945285e9.6.1782122515233; Mon, 22 Jun 2026 03:01:55 -0700 (PDT) Date: Mon, 22 Jun 2026 10:01:37 +0000 In-Reply-To: <20260622-alloc-trylock-v2-0-31f31367d420@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260622-alloc-trylock-v2-0-31f31367d420@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260622-alloc-trylock-v2-10-31f31367d420@google.com> Subject: [PATCH v2 10/13] mm: Remove __alloc_pages_node() 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 , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, Brendan Jackman Content-Type: text/plain; charset="utf-8" There were only a few users, which have been removed. The only advantage of this API over alloc_pages_node() is avoiding a single conditional branch. The disadvantages are: 1. More API surface, more sources of confusion, more maintenance. 2. Worse impact of CPU hotplug bugs: most users of __alloc_pages_node() were using the result of cpu_to_node(); if the CPU gets hotplugged out this will return NUMA_NO_NODE. If one of these paths fails to protect against a concurrent hotplug then page_alloc.c will use NUMA_NO_NODE as an index into NODE_DATA() and cause some horrible memory corruption or other. With alloc_pages_node(), the code might just work fine. Ulterior motive: this frees up the __* variants of the allocator APIs to serve specifically for use as mm-internal API. Signed-off-by: Brendan Jackman --- include/linux/gfp.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index cdf95a9f0b87c..7edcc2e0be9ce 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -278,21 +278,6 @@ static inline void warn_if_node_offline(int this_node, gfp_t gfp_mask) dump_stack(); } -/* - * Allocate pages, preferring the node given as nid. The node must be valid and - * online. For more general interface, see alloc_pages_node(). - */ -static inline struct page * -__alloc_pages_node_noprof(int nid, gfp_t gfp_mask, unsigned int order) -{ - VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES); - warn_if_node_offline(nid, gfp_mask); - - return __alloc_pages_noprof(gfp_mask, order, nid, NULL); -} - -#define __alloc_pages_node(...) alloc_hooks(__alloc_pages_node_noprof(__VA_ARGS__)) - static inline struct folio *__folio_alloc_node_noprof(gfp_t gfp, unsigned int order, int nid) { @@ -315,7 +300,10 @@ static inline struct page *alloc_pages_node_noprof(int nid, gfp_t gfp_mask, if (nid == NUMA_NO_NODE) nid = numa_mem_id(); - return __alloc_pages_node_noprof(nid, gfp_mask, order); + VM_BUG_ON(nid < 0 || nid >= MAX_NUMNODES); + warn_if_node_offline(nid, gfp_mask); + + return __alloc_pages_noprof(gfp_mask, order, nid, NULL); } #define alloc_pages_node(...) alloc_hooks(alloc_pages_node_noprof(__VA_ARGS__)) -- 2.54.0