From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 24A4E26980F for ; Mon, 22 Jun 2026 10:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122516; cv=none; b=KKnXWTlkQ4NFufntjOa5W61PyrdcDiSGcMK7C9Pu4rj25kano12bBzaZTPrdiC9r1vzayjOErQn2iKwdI3T2WdCQOMSYqXgAusO/SrEDJ1JV3NqanX738NClOa7TM8JLIU9IkxQY3sS3xS6k0U4MM+rHF4v0vm90Kp86LjpzWSU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122516; c=relaxed/simple; bh=hncVUkOBSjCSge9NF4UibQdahRu3NGfGamSBeSw65MU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=PhkyNTlH7yMkj7L469EXo48WAn/EuFtYL+YdQaPpNtladlYFncbspHf0rpy6zE/51SUOPygwOPIsztUyjkznpI+PlvKl+LhsXejZ2i1iXumnbZDxH2IWATdxiaZ4Efub3T9cn9+MxB7xiOxHeXs9AxZtcYLn3g6VP+IknbNbTj0= 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=DJrc7cMa; arc=none smtp.client-ip=209.85.221.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="DJrc7cMa" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-462c4593a33so2849861f8f.3 for ; Mon, 22 Jun 2026 03:01:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782122509; x=1782727309; 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=DAXfb8BCSbPGPrK7X9VVeT4nqNdHAMMoqJF1QOMo6js=; b=DJrc7cMa4M80atQtcQT4qA4Y20zxEmzF9gy2nMdz2PwsW17Z/R2aiv/3Scnnc8KThp Fa9rmRAZ9O5l/WucuTcPPTDYotyNPQq1zlW67M1+amOtYTJ2lTgU2tBAdsS+pvzrMUDf RSmORiStoJfjLiBfNgGqXwCYtsmU/OVLWEbOYwYwmdWY1IS3cPsAy8DwEykYny+ltCDh 8AwBvdcyOewoj1M2gW8qAxAqd/W7GDwYcWGBuYBsxX7laeEVXF6KPlG05l5L+9Zg9r0S 9L35WkcE/wta2LKNV8VPJePaQPLvimyGGRLXlphZ0h8BG2oEReGqOyMCN5DtB0HAggGc QuEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782122509; x=1782727309; 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=DAXfb8BCSbPGPrK7X9VVeT4nqNdHAMMoqJF1QOMo6js=; b=P969SHbJBYto9xgvb+8LUNljEePY2wy5h+NSGHpjik5lOgCApBM/nKOWA8CvTrFk21 0Gg/kFrfAhcwXxeqv7WIhYVrG6Y5owgFfA3jlYL+LR9FquLQP0Qx8DYomTjvUxod+I41 qBvAlvyjRi6t1xieiul5j1EkZeaHVxm8e2p2ywUf1ekUluMZeV1+CzKaFhIar+n22otw zlgCCaQ9nNb+R2AmtRwISbhrwo42D7qEcqElvKloX3hcNo16/UzlCtVBNUDjWlvTld4D uKo7jGhJtmdPs3lacFl00mXXAsiaBWEqHEPnqd8Cgyiyxv45H1vqkHwv/6ue5I7G0dsL 0MMA== X-Forwarded-Encrypted: i=1; AFNElJ/rTz9dXQGMmRny4twfUKwvt0TFD+sLc/AKqE3bQA1S3JS+Hqv5nET3eHzA2iWVNec7IN/lrZXhbVROw6U=@vger.kernel.org X-Gm-Message-State: AOJu0Ywu8CBbqgfrGgTEeR6ew2elHTG/crmmW676kZVvB35ivfDYFhlO hszYIA119YNAa52rmGT/EDb51a4nX7SprE6qRCiukD7DzaCcNQE45IbX9QOc5RK5IRPNu8syADE iyP0sjy5wTqiOOw== X-Received: from wmhj19.prod.google.com ([2002:a05:600c:3013:b0:492:463f:2524]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600d:8653:20b0:492:488c:f627 with SMTP id 5b1f17b1804b1-492488cf6c8mr100943345e9.11.1782122509368; Mon, 22 Jun 2026 03:01:49 -0700 (PDT) Date: Mon, 22 Jun 2026 10:01:33 +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-6-31f31367d420@google.com> Subject: [PATCH v2 06/13] KVM: VMX: 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 , Sean Christopherson , Paolo Bonzini , kvm@vger.kernel.org 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: Sean Christopherson Cc: Paolo Bonzini Cc: kvm@vger.kernel.org Assisted-by: Gemini:unknown-version Signed-off-by: Brendan Jackman --- arch/x86/kvm/vmx/vmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index b9103de01428e..23ba400b30eec 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2994,7 +2994,7 @@ struct vmcs *alloc_vmcs_cpu(bool shadow, int cpu, gfp_t flags) struct page *pages; struct vmcs *vmcs; - pages = __alloc_pages_node(node, flags, 0); + pages = alloc_pages_node(node, flags, 0); if (!pages) return NULL; vmcs = page_address(pages); -- 2.54.0