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 15E2B3A0E8A for ; Mon, 22 Jun 2026 10:01:54 +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=1782122516; cv=none; b=Qi9oSxWWBVNuTjMuEbGyYI94X6kVriPwWn8tsF4c6MUpNm24srwS6fbgwF4qxcOsgNO+O2jTPF5VhQ+RNWnSGmR5APQUFCpw7cJdOqXJskuq+EADX1wHpg7A4tajoV9pAYhs1NGX68cvn8+Fgl0yt6lpY37phGFpxRGugfMA3ck= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122516; c=relaxed/simple; bh=dCcMAMLOMeAw4obuTGRcGO0t+lrz+rjvtnsdBQ0mhf8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=QuqYij1/hh40GPFxeRJKPtzjSY1d0P2fej83BT/BZnZNLLiZr06z0YWrkJ4XekJo7lnMzEVqgfReW1G6heWabjAgKgCUqZcxfINb9WwlV6sgX0SwpbuFiRgaUzQydIPjOnMTPUeFVKLllpMPExtz+7uXB2E21Wn6mbFih3SvT5Y= 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=BP2NxE3N; 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="BP2NxE3N" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-490cc1ae292so21433765e9.1 for ; Mon, 22 Jun 2026 03:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782122512; x=1782727312; 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=SzngTEUmnpI9e8CaEbeiYK4MLoCzByF+Q/8MZRzDpKY=; b=BP2NxE3NIINDlo2x5NH3gtztv6rCxWO9BHSmfy6YsUD+E9nls7wHchkM9Hr/MwVSMY 9IXbJnv/j44frFCrm+j2T5NgCNY02X5DIZvf2RljQ84AmxBQ4H4c5HtVEngzaGF/0ZI6 JAXJgTeEyzH23M9QuqNaJMZu4h2Uf8F0fLhRFl7E2RGFKAzW2g8nTkF8jWIXPTfxQMlv /dKtiFX5oW3XoZIjmXvc0ErM/24b3ju6u8JJT5Hnzw6TH8HGJEl64Fmao9YG9Kf+pZ7J ZsGuwVzXPjWRjzhadSOBYCftDf08pA0AMM0I2kko6Xn4a4p7CJYbSe09U7BDZ45e4oVg a93Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782122512; x=1782727312; 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=SzngTEUmnpI9e8CaEbeiYK4MLoCzByF+Q/8MZRzDpKY=; b=frs3wac3B++ovuJCUyDzqBJGNwpQSfljAUWQHG5vXtYqvnG0GIAPS5Gu3/iCtsjYmh c5LQx5OvIihRxo4nrAcN+Xv1FANyuiA0goYmVpS4m3JJfoP5jpK1kQ3+Ex+brCKpy7Ic rIUaFGX5SECEZTCOkGYs4Fze5+InoRyWVS+7WNh3EgiCEa2N27Eic0IEs+X8ivR0tny3 Bdsq7vym9Uor2LkxJw+YOMChxKGR+VuKqeT79SMDV0D7Q2bgbIOxWyGmooFBVtdzL0dI jylHB9kEJf1mnKxllV6qxrZ/kb24wu5xhTJVYM1ARk+DWxbQoy06CNYt9+kUcoEARkvT Rq5w== X-Forwarded-Encrypted: i=1; AFNElJ8tiN2qjsMujh+VqbCYQXKko7kxB2k+5+CvJwr+wh0IqAy+LqCng/Mb2o3HXiSOJQzqi+fuvDIW/Z/ANQ0=@vger.kernel.org X-Gm-Message-State: AOJu0YzZlepKCsukH/BHxaN9+QXD/2zLyAn3R3sOle8Z9A1IlzaQ1Ibg vgNWX7vW8vVbNt+stUAH3bulcQlk91UHq7cHGYvZl79N3sAcXGR0HioPWagZmvLYc7p6mqsV8z4 Wg0jotEBJQyyv5g== X-Received: from wmpc6.prod.google.com ([2002:a05:600c:4a06:b0:48e:6f63:7624]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1c27:b0:492:4871:7e21 with SMTP id 5b1f17b1804b1-49248717fcdmr138183195e9.10.1782122510601; Mon, 22 Jun 2026 03:01:50 -0700 (PDT) Date: Mon, 22 Jun 2026 10:01:34 +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-7-31f31367d420@google.com> Subject: [PATCH v2 07/13] x86/virt: Use higher-level allocator 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 , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Content-Type: text/plain; charset="utf-8" The difference between __alloc_pages_node() and alloc_pages_node() is that the former allows you to pass NUMA_NO_NODE. The former is going away and the latter works fine here so switch over. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: x86@kernel.org Cc: "H. Peter Anvin" Assisted-by: Gemini:unknown-version Signed-off-by: Brendan Jackman --- arch/x86/virt/hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/virt/hw.c b/arch/x86/virt/hw.c index f647557d38ac5..4251e410474fc 100644 --- a/arch/x86/virt/hw.c +++ b/arch/x86/virt/hw.c @@ -183,7 +183,7 @@ static __init int __x86_vmx_init(void) struct page *page; struct vmcs *vmcs; - page = __alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); + page = alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0); if (WARN_ON_ONCE(!page)) { x86_vmx_exit(); return -ENOMEM; -- 2.54.0