From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.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 B6EF03D34B9 for ; Fri, 3 Jul 2026 12:32:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783081961; cv=none; b=YsV4Gwl+s4fsRcViocwHzmqListRV99A+ubolEH2ZalbcT54mqQiE3XkFZzobL1NJ5z2qe23V/Ppr2+Shvqa5vgC6tsAOix2TnfiLRTVarsvuASdDtDLZMHTU77GU3Nus+0ApcqXnnKDmkvyPzqT8X4nIuEN6GIuwVv97apqhBE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783081961; c=relaxed/simple; bh=etU0KmQ93MVQ8p8e74J7jmNSb0FdCttGT65sD7BwF2Y=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=fFjP5lwMOL8p1ebLVUm91N2+zLppY0rkd6WAluya8joi2WawWoOuJ39PNGKZ73sABE9Bf/kyC75H+b/d/MzMwMIT82KLDS69LqY683dCa18Mc2HlZ3ZBzh6OsyvD4NrqoUwbqyIUFaasic7RzOXq4DpZ+Cs74MkvK8E2/pgr9bk= 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=M99w4ild; arc=none smtp.client-ip=209.85.128.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="M99w4ild" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-493c1bc7a70so5185275e9.1 for ; Fri, 03 Jul 2026 05:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783081956; x=1783686756; 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=BxUSvpYnRk7TPJu9DIAcrJg+2SEdx9XX7++N/RbsLUU=; b=M99w4ild7mW9DGSHEx4WkY//4c/Jm+OgfaanY0fhGfOFTmwtd54gaCYiQ6NWHZ//zB ILbni0CwG1L6+i8U+vwmEIngrUHzJ6AKbjxZddeRT3WpyplFclEUHd7Kxpx4TKZTWtQ9 6uH7rHPn6Of+z9rXwL6hxKdozLp7OJO7LSc8O/QKhOPq6bCOHtIS+W9h2hyG/rV/sd6E W97OWqIx4GqbvvmS3QjzM4sdQhhADzeRVCczjGz2V0JsWhKIc/pFFEr934aEab7IWh9M tKztBrxp3HVnhqcymzbCsk/EiSOF8nr1Kaykt4bxz5ecFzvAGUbv6453UpqFEmikVyOp n2Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783081956; x=1783686756; 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=BxUSvpYnRk7TPJu9DIAcrJg+2SEdx9XX7++N/RbsLUU=; b=bH0MCAcxMLOL7LE8PW9z8K2DLyLR7X8xL+upwjRdXH6YQjBBkPa3YCGJbtO0+jsh+Q ilIm9q2sEmOOU2gE+RYb/nN0U+ZXFLMBq0neVF/XJU4h9d8GYMDOystCAZGz5sjeUQs+ 16RxlPY5IPXIKdzNpS+P3asJALSMZInu+Jhrcy+8YGjKfe9PEDAhPKLzHIrx2z5hH7eR IVvpZkCKaRh512dXn4i+murgpc7KvF63Vic7EhcYZjrob79SEPMpHw/LdoGYnNdIHFrn KWAlFDK8bnl25hPZ8rexgoSzrbUtT/CFEjTkvp9qBtnEhfdEZlc3lxxSoXc3wFUpKki6 4MHA== X-Forwarded-Encrypted: i=1; AFNElJ+pRF3sMtij7VPExJg7zNMn8T7re5bBcI3Cc6RAH7xDpdDW2jXx1UtobkB/cTMocxFq8uib2sXvHejEoc8=@vger.kernel.org X-Gm-Message-State: AOJu0YygXcf85B74qYVzJGihE4PD+5zWg2C0eEoiJbs33lv/KkEg5p6p 9k1LaY95PrT8LkAZuIV6RjnRDwqtb2sCwDuqQwvyqndHsNY2paPvK/qvdxnpu/2J6WtQN2kU9DO 6vEQV7u+sjS61iQ== X-Received: from wmdn10.prod.google.com ([2002:a05:600c:294a:b0:493:b4c4:536f]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5d3:b0:493:bd37:1cdf with SMTP id 5b1f17b1804b1-493c2b3d40bmr104790495e9.2.1783081955851; Fri, 03 Jul 2026 05:32:35 -0700 (PDT) Date: Fri, 03 Jul 2026 12:31:53 +0000 In-Reply-To: <20260703-alloc-trylock-v5-0-c87b714e19d3@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260703-alloc-trylock-v5-0-c87b714e19d3@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260703-alloc-trylock-v5-13-c87b714e19d3@google.com> Subject: [PATCH v5 13/18] 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 , Hao Ge , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev, derkling@google.com, reijiw@google.com, Brendan Jackman , Yosry Ahmed 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. Reviewed-by: Suren Baghdasaryan Reviewed-by: Vlastimil Babka (SUSE) 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 01d6d2591f49e..3bf55a5f9143e 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -256,21 +256,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) { @@ -293,7 +278,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