From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.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 AAAF33D25D0 for ; Fri, 3 Jul 2026 12:32:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783081959; cv=none; b=QEBVs5avIczjoIsNGFdJ2HRPkTn1cc46buMAmZxDl7zT2D4TIpRLkcdokMc4R/BUp+BhVmsF8u9SJn3+gRJiqFT8MJcnY3H34+ELfzqfqByqTRmST2I8O2NXtxirko32C6tJ3sl5z41R9GwjVwFeMdKTD908vyeTHcdeM40Kbm0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783081959; c=relaxed/simple; bh=KNqrD2+2Bt6o9OriZEPOrcJLAbYLOMYUdx5zH9TW50c=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PJkTSAxw/bueHC/daZUyc4EysTeOtGwwgMwhAgmPPxCGUC9kvkqzk+GObfeRxT1/STwPcFq1tKUlc0Bmh6F5PhMmD24MNxOVoAlzDqUNnPM1DPMIfK/VjAjkYFYPiBNp7Lb77nc8ppCDf3oKcDC9toXr1uLjrdXE6GK49ADwq8o= 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=ev022sAp; arc=none smtp.client-ip=209.85.218.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="ev022sAp" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-c092c622e15so44877366b.0 for ; Fri, 03 Jul 2026 05:32:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783081954; x=1783686754; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=oi2WdNtyn6OBAE6+L/wDlXe84IAgE1icOUsCwlXzl0o=; b=ev022sApdidyJCkJR1RAc2eUL2xFVxmR8zDK2VEolUc6obsdOvxTZ0RfgdcmCe0O/t IsjVyxt2HvmjIor4JiPR3hgYC2SjNVquBpCHXOWU1KRsQoZC7zGkUcGV8OmWaq0CgXDn t2uI7ZCXzSNvUsAr3FbnVEb3G8IVi0ugnvP/AV8SKeqjD2JH7RgUO8EJbt1kymgQLcqK 3aU9bD62FFaKW7XXsUwZRryGq8vBRfS3e6ERy6Lq0M4BA/gHRo7Y7dsufoLZMfgmRSv0 pMElUX1icddWBnGLTV5waPgJtwvyFd2xkhlY2wwOFD9QUe1kanKsNHqHjOtubjt17m5w 2vgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783081954; x=1783686754; h=content-type: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:content-type; bh=oi2WdNtyn6OBAE6+L/wDlXe84IAgE1icOUsCwlXzl0o=; b=cvgs1baTYG86sqs1rn9F7hshgL9pIO8KZJM1qxWkIYJTnH050cdzrLuwph2bkEJZI8 dFYq7ddgzhn6QvhzMmiPznIhE0oZooelQK/h3+nWV9UKhqFN7qW6jM+Bzw78cb3FsJEM i+pa14PDVfj8/mc9X9gAKKM1vkK+aMq1chGd3UDbW8aiov67P43krjCeNMPmyBV6N3EG xvNnIOtcGluxAx5hsU/p/4G+MS14UTxUjH/d/LOGdJ/KFC5EBdMhKX+Vg6DOfgaT8nlb 3Mg6AOeWjjCW/RMpWHB6gP9aw9ErEcFyxPI7JmUymOuDHL+k/ehnVXjycnspJRaIA7tw A0kA== X-Forwarded-Encrypted: i=1; AHgh+RonK2QrmgQvf467xiNo9tkmYWiXFyZZuiBujjOMGRMD+8J3W50OCLLu+cPGqw2hwN5bueHnnwk5Jr8x408=@vger.kernel.org X-Gm-Message-State: AOJu0YwAMsoj9y1Crif2GpDjfrtCxHQJgZnuNcepFICkeqxQtUMsMPLd YlqOljsjQXqoH/mG68eCGZrINblgR47iutB/8vG7vAois6eNDZ7CoWKRMM+kVvg9BKCEINYWUb0 kbNEnfPwk7BNyXA== X-Received: from ejbqk13.prod.google.com ([2002:a17:906:d9cd:b0:c12:75b1:2e99]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:906:22d6:b0:bd5:151d:2d31 with SMTP id a640c23a62f3a-c12ae45e66fmr436553266b.13.1783081953398; Fri, 03 Jul 2026 05:32:33 -0700 (PDT) Date: Fri, 03 Jul 2026 12:31:51 +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-11-c87b714e19d3@google.com> Subject: [PATCH v5 11/18] sgi-xp: Use higher-level allocator API 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 , Robin Holt , Steve Wahl , Arnd Bergmann , Greg Kroah-Hartman Content-Type: text/plain; charset="utf-8" The difference between __alloc_pages_node() and alloc_pages_node() is that the latter allows you to pass NUMA_NO_NODE. The former is going away and the latter works fine here so switch over. No functional change intended. Cc: Robin Holt Cc: Steve Wahl Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Assisted-by: Gemini:unknown-model Acked-by: Greg Kroah-Hartman Reviewed-by: Suren Baghdasaryan Acked-by: Steve Wahl Reviewed-by: Vlastimil Babka (SUSE) Signed-off-by: Brendan Jackman --- drivers/misc/sgi-xp/xpc_uv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c index 772c787268932..79c2f00ed4d70 100644 --- a/drivers/misc/sgi-xp/xpc_uv.c +++ b/drivers/misc/sgi-xp/xpc_uv.c @@ -170,9 +170,8 @@ xpc_create_gru_mq_uv(unsigned int mq_size, int cpu, char *irq_name, mq->mmr_blade = uv_cpu_to_blade_id(cpu); nid = cpu_to_node(cpu); - page = __alloc_pages_node(nid, - GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE, - pg_order); + page = alloc_pages_node(nid, GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE, + pg_order); if (page == NULL) { dev_err(xpc_part, "xpc_create_gru_mq_uv() failed to alloc %d " "bytes of memory on nid=%d for GRU mq\n", mq_size, nid); -- 2.54.0