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 8C8463D45C5 for ; Fri, 3 Jul 2026 12:32:33 +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=1783081961; cv=none; b=Cn6Rzb44fHpXoMfnBc8uBE4YWvV3r9+OXi8EFNSieMfLU2eA62B6qLsZYsq43kcODks3sgyY9EQvc3gjuDyH0KMfYZoKQEkFqpdXxc20cZt2zv1xMeEYnD/l9Zlbfnve+YzPt12+EIdyeuQ/JyexEZFjkPZiAlj9ixqj8S6oHpA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783081961; c=relaxed/simple; bh=gAX1ZmzFPfazfApyiQ0SZUESO7aPJSw5OGicaVcGYLU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=tbHVDoUjW2aSZc8MuNWTtMe9X7AE1nTfCCQAYV0evbcClN14Ed4B5V38Q/NK31OBiid0BZYj+lVMS+tnUfwI4l2sJteAEeyhzxDFu8j67iyRkhJxpIz9BBahcmThcKsfVcRxKtiPn/Pkw2CFZaJUlcmC1CFZWqmI7rIIjBdEBnw= 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=JO1H2Mdk; 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="JO1H2Mdk" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-493bb6a4336so4756265e9.3 for ; Fri, 03 Jul 2026 05:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1783081949; x=1783686749; 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=JO1H2MdkdImw0jyGxmHbXkiX1KZsox8xcA/y+XgwpEYCI+fidcE7rE9ykSXuoqCsYo Mb46Tf659D3TkytPNjgA3k7ySpml/R0nJjMKZk5/5yA0T3wROQLPGMmtQKrQiQlxBM9J 1PT9crKWjskdAqMEKoH6UH2iY/yZZGQ5LF7XQxGm9nT7FJwSvL5GMoOpe2diTu+hLPYh UEJkJsMnOLpdcEp2I0ySCcwHBHpyv/W9ZSTKG1K3q1atOeYFmB8Yp+LS46IPPpYJQym8 c2IGKEzNpX4gkENruJVzrJDQEUj8fcozVvh5YK7G+OTK2E1DZWsHh8ql5Dn1OSRHw2g2 w9Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783081949; x=1783686749; 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=RmmFIZxLshdlF8ZZuMyAdoNuOHWEYxoyGygAHFq22EmlBxC+Aj77fcVykiLIXPXcsS 8srv5fOVYKrY0X3gCkrMMm9z0Ook0mLh8atXylGfC7sOST7hlcWDteQkZjCcyLKcsD/j 6pi2+etKjPB+9qrpuDNXdESV3OMVNhqV0qlP/1rz+6jZVMF1egYmjMMXneSlbzVWB8aw kzxHwv9b7H1GHVqsWamG6oY3U3T5hPfpQkhNM1A0VhDpTUS5+kUlPOXZYDBp8+ENxjuL s8WPBuvo1DogAoBEQ/zGPQXrYWEsQ8CkEwn9sh/44f5zewOsIkrVXuU4rg2T70XNTESu 3osQ== X-Forwarded-Encrypted: i=1; AFNElJ8RdfDRRMKm/fLiIMxPJ1v6zJTVrGPl5kkIWGEcHtYxhrhHEF6aN1h0qhMQGDA9Com9UVu5eOIjqGOekrg=@vger.kernel.org X-Gm-Message-State: AOJu0Yzs05POnAKIobChbCxKZTtfWp6QTkoxH0gSHTUAueKCvuEaOqwM Uw81eFlPgWdoK7XxFBSM3w1m6GVLY3C9ciTasieOmq95RbBO8E6s8VRSoY7JDDxt9h1tSNd9aq+ s7KTdEqKF+oE0Cw== X-Received: from wmbip29.prod.google.com ([2002:a05:600c:a69d:b0:493:b6e1:bb31]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:5296:b0:492:6efc:7c60 with SMTP id 5b1f17b1804b1-493c2b99781mr138970395e9.28.1783081949082; Fri, 03 Jul 2026 05:32:29 -0700 (PDT) Date: Fri, 03 Jul 2026 12:31:48 +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-8-c87b714e19d3@google.com> Subject: [PATCH v5 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