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 D85C14D2EDA for ; Thu, 2 Jul 2026 09:49:58 +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=1782985801; cv=none; b=m7M68ENMBH4QH7dn7uFOifLbKAh+gUlPGyPLH1KJj6cmjnCE4+1/M37dURB+52Ef7zLLyEDf1YhkvYjVvlgU3X4PbJQtY8TDqbnXfEfoCwVLVVKkk1CKbNUSj8I+zpIal10Ua2haM+HAoCk/JpjD3TJIKzVOvV1lgI5khPtgFvU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782985801; c=relaxed/simple; bh=gAX1ZmzFPfazfApyiQ0SZUESO7aPJSw5OGicaVcGYLU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=h7f9uPVooLew/sXclNoYx9eAcXf+v/vzEFc+ZV99rvKLQH4a5WGP3BzyE+0VoLLAVa1U0Sg4fe/fTNJak3SEj9kZbjaBKsJR3lm/8Mto6ByNrVu7ZiJQY68iRRxIWpbENSC9FAxlj663DmpWfNKo9W+jbR0RLs0tyG/MViiKCa4= 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=jpcPO6sM; 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="jpcPO6sM" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4925bf70f5bso14469135e9.1 for ; Thu, 02 Jul 2026 02:49:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782985797; x=1783590597; 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=kyqQt98xw9ATzSToTJPs54AMwBuvYnqZayPicgnewLI=; b=jpcPO6sM9Wa6w2neoBwFNqWa++ainDs15ljHa0uaGglcoui97iNERE4qGTe1IUED6V dWH5Nohc1Oq9YRw4a9L1UqSjE7Rvv5I0SNCursZv7A8j+GIyVN56wXbO/ZF83FfK12ou RjuwnXrV2kJedXaEY9GKOe5bt7118Hq+sdBR26F80zCyjD7QpsWXafG3bKUcPsJ4BbRk h90V+S9cffp1ZvksTuGOBgt8ehb3bl0eELh2pi3n2k7pDl6h1k1ZG4YRPnkQnMfbbmHM NBsX507XG6M0gxpIbYuw88gyH/4XtzxErVHZbMMGrEa964W29Gy0Pj8zdO/afGPDU3G3 kO9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782985797; x=1783590597; 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=kyqQt98xw9ATzSToTJPs54AMwBuvYnqZayPicgnewLI=; b=MwS5diWTDSsG5jPsaT7NnPp7kSOY7/bd/Rg3NEYuJljV+fIcdLNI7tF6A/8dmGLZCL 4mJNVy4AsXtXGKptSdg/BX8HCuQ4ligmZA3Z30cMmUZeKbvmI7/ftANPt4g9g/teOn54 /RahnWoxOfTCy6ouq44kEmJvexihp+iPChWx1VHk7FFtlhlBW5brY/YjSrGKHTcoYEr7 gtWSZxEP8Fe6zYE7X2+YQFXhptL+kNr/1b3lM88+tPWvFNCg4/PGga3NIBmOFh4SIDz+ JwfHGD8hefTQNf1HMPrJjLVJCdndBhCwp8WsuuZEyr1+J7yyRK36cSqNm0ZevlQIxqEi FBFQ== X-Forwarded-Encrypted: i=1; AFNElJ89W8nzyCS3qCDBwNO+wirXlt6yQAV6Zf5yZpp4mzQZJ2iQShDYBDS9o0havnX/b0w/EwqVmzvYMPclQh4=@vger.kernel.org X-Gm-Message-State: AOJu0YyY9y7jKZvraVTjgva5EXoWdq+706IEnc7ZTVftB+ZLciALp9q5 tLIwXIYMA4+aovpmApkd/5wc2RvhjjtKt2ICm43UoewvqjZ2q53hm3shsCdRFkq0xaTtfgogHxm oSk19ypbjBnlm2g== X-Received: from wmbf16.prod.google.com ([2002:a05:600c:5950:b0:493:c773:ff79]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:a4b:b0:493:bef8:ba8 with SMTP id 5b1f17b1804b1-493c3dfc635mr58366765e9.39.1782985796552; Thu, 02 Jul 2026 02:49:56 -0700 (PDT) Date: Thu, 02 Jul 2026 09:49:39 +0000 In-Reply-To: <20260702-alloc-trylock-v4-0-0af8ff387e80@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260702-alloc-trylock-v4-0-0af8ff387e80@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260702-alloc-trylock-v4-8-0af8ff387e80@google.com> Subject: [PATCH v4 08/18] perf/x86/intel: 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 , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark 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: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Namhyung Kim Cc: Mark Rutland Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Ian Rogers Cc: Adrian Hunter Cc: James Clark Assisted-by: Gemini:unknown-version Reviewed-by: Suren Baghdasaryan Reviewed-by: Vlastimil Babka (SUSE) Signed-off-by: Brendan Jackman --- arch/x86/events/intel/ds.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c index 91a093d8cf2e7..70be80211d823 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -832,7 +832,7 @@ static void *dsalloc_pages(size_t size, gfp_t flags, int cpu) int node = cpu_to_node(cpu); struct page *page; - page = __alloc_pages_node(node, flags | __GFP_ZERO, order); + page = alloc_pages_node(node, flags | __GFP_ZERO, order); return page ? page_address(page) : NULL; } @@ -1088,9 +1088,9 @@ void init_arch_pebs_on_cpu(int cpu) /* * 4KB-aligned pointer of the output buffer - * (__alloc_pages_node() return page aligned address) + * (alloc_pages_node() returns page aligned address) * Buffer Size = 4KB * 2^SIZE - * contiguous physical buffer (__alloc_pages_node() with order) + * contiguous physical buffer (alloc_pages_node() with order) */ arch_pebs_base = virt_to_phys(cpuc->pebs_vaddr) | PEBS_BUFFER_SHIFT; wrmsrq_on_cpu(cpu, MSR_IA32_PEBS_BASE, arch_pebs_base); -- 2.54.0