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 3C5D841167E for ; Mon, 29 Jun 2026 13:12:28 +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=1782738749; cv=none; b=ZjV8Nr5zniAfNcydlFnFq7FollXrDKnnLtvzHBnp9w715I5/4l8JI/s0VkGac3RgUcdndsad6Z5XNEcidY4oDMhqR0RQi68awuJTnHHxpbslctoohd1POj2pK5oRBxFpvJ3HrcZP56kXKS4vFG0WvFyLCyhEfcbCorFiL1pMFdA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782738749; c=relaxed/simple; bh=8AgIFocv9gAdgFrvqd5zMeVFut960DYptbjYIWum5XY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=bDZpAK/L4dkDLfPuAdVhlw2GiLjNh0wPJ63KkhiA2bHKUF6d99iUKgBCfxi9McEiXj+gobWH1Kssa3xOVnMC4UomSxUQY5kV0DjlFXKyrop+d8YmCdOnoJYGy8QxzZQG40ve9Ua6LWxbCmqy9xw+MClxnKmAc+hG8umGOMwBBZI= 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=Fou3mTXx; 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="Fou3mTXx" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-493a6fe9ebdso8096455e9.0 for ; Mon, 29 Jun 2026 06:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782738747; x=1783343547; 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=NVcvWpPvpGh0KKDm0kFg3LoFKQtlNo0e/vWFcO+Gc5k=; b=Fou3mTXxw7It4VJSebjJfz/M20YN1+bWuMxBRPo333X03AK9PxVkqgNR4k3N36zqu5 yXsIMmXae2QrBvnhT0l6Yu8fhEO67N/iL9ngFegBlMEdEQvl/0BSQ+pBk0dwEWaGTxF3 R2kWrrD30QkuI/ZKQr6tKhgweL37yqSddB/UuxjR/uF79gy6niIw1pl2nRT1ofobfG95 be6qsw85I04VpKI6q8EWEVztMZMrs8SxRATAtxtKCM86L3foALUBY9CM2DmRoBUFofqS AlesDBLJu3bClkUw08Zt8T4tiVtKDb3b0oV9klnDBOg9SbNAUAOfTpGfg2lrn8SkD0KN t7Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782738747; x=1783343547; 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=NVcvWpPvpGh0KKDm0kFg3LoFKQtlNo0e/vWFcO+Gc5k=; b=BsiNrOGEhbae3RWko7RwO7txfocYd6uKuFl4TRTIYzwUalQG3A62scUN9G78kv4+w9 v1ynJ19NM7SnyTGIJGGyA+quucIFeRCiDxasbLqHa8xgq6bRPhuhW3q8jAGO9j3Aeof0 HTdHL/A6fk/3eVTbOtzKxp3ZUHDJ+2CWVS4hYtKGAppBY4nuaFUarPLK00MIdmqTQSOv HnsG17H0e0w2VyCJsKXSVhhaYhst7LJD0v4dEZ2e1FTt/FZieFvSiUae1i6MwUd46jlp YYbcfqV8i6RjSh0ffdhTm3EGv35Cvo0384oBihLxOMgLW4ID+FDi06wS+tYTTZ6wgi8W G7Ew== X-Forwarded-Encrypted: i=1; AFNElJ/rXmsL7D0VTQmXImQNbHfAHJO6wsWkJa6zqgXtPHz0+MYFPfy6eP4NHsv8NE76ibg+0JWkBVljIvOMw3M=@vger.kernel.org X-Gm-Message-State: AOJu0YzwOxMr7bKpoeFuiLote62bKS5NaIynmQdV7B3Wwfai98vIgHtY HZKWz2K6nO/+c6Wxo92JZpXTyQsoWU9WGLs8RBWe4H737zH7VQeVegRLquJAl4V209sp8VQl+4N M7KDAWQePWLzLxg== X-Received: from wmhn2.prod.google.com ([2002:a05:600c:3042:b0:493:ab17:3e61]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3f18:b0:492:6efc:7c60 with SMTP id 5b1f17b1804b1-4926fc919c3mr156189865e9.28.1782738745900; Mon, 29 Jun 2026 06:12:25 -0700 (PDT) Date: Mon, 29 Jun 2026 13:11:57 +0000 In-Reply-To: <20260629-alloc-trylock-v3-0-57bef0eadbc2@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260629-alloc-trylock-v3-0-57bef0eadbc2@google.com> X-Mailer: b4 0.15.2 Message-ID: <20260629-alloc-trylock-v3-8-57bef0eadbc2@google.com> Subject: [PATCH v3 08/16] 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, Brendan Jackman , 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 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