From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.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 DB7F33A1E7E for ; Mon, 22 Jun 2026 10:01:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122527; cv=none; b=oSsR0ynVbtwYNlqsodwnWp1E6WFqROQCmUUyZxExqigs2yiLNXVe+jGZ5uRlAb2+ki6Fdy2bFxrjQ/YI+nTcxQL9jZUokNmv4f7UyHck7a2uYsY9+VpsxejfrfIMqNOe3rD7CLME/LOj5YuuMOkrbf/ksnvujMem5/3ESy+UHLM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782122527; c=relaxed/simple; bh=4lW2Ze6qmox/FZtLj928PmXt3Eb4zkO8jT8QwcqnvMk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=gRWh+X1f5p5Im1BgSzPwyr8x8W8X7ic/2qUDCO8yPUmZAwW0Lvo+vGWIVE+TvtYBFn3xafQVqQXjwD8Y/zvts7qWSncakZDxlE9DV858RrosZNAbNfcu499d7GmWGca4ukbL/F4GxaDKU2mOK8gM/YukSwFDTSFQ4zc5dxy6tBw= 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=k7MTBHkn; arc=none smtp.client-ip=209.85.208.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="k7MTBHkn" Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-695c6b2814cso4372371a12.1 for ; Mon, 22 Jun 2026 03:01:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782122510; x=1782727310; 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=9S11xQ2ndprBO95V/I6wL9RKFczfzFD4sM9MNZL9BLw=; b=k7MTBHknlvJFbfQvY31jXlC1HvaxlN+qPIfj22H2yb+rY+Z2rhyylXwiOk3FAlMB5d QSzM1Ano4X2BNVGjdrbSTfr2zqSLdp0r2hG5BT1P5i3ULsrPGplR+60tpb7u9j5wNa/W z1HUk9D5pONWyHITZ9nsSXNh9Y+RXY4OfElWVZps5Ms4g3b+GtZsu1HQkwuGfTlNHSxH Npe7LuCri+7I2aB5Y9vH3M/7mMK7X8yce9acg9lbDMO3NpdCPLkZgrAIQ8eNxHhfr7wD bZUcqKnKmSbhHq0psqLohghsYQxtKr0p9br0MWBYF1v71Rl7w9GUmbiieeMlKXVYozSu 1y8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782122510; x=1782727310; 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=9S11xQ2ndprBO95V/I6wL9RKFczfzFD4sM9MNZL9BLw=; b=RR+NQw0lzRaUzGSBCWtivrW7TRLrtkgUrgxIpq5yxnHzzfau7vtjVhboBvVI3yfaUP lbeiCmgIB5wLucfqoau9HkLX4JTgxkf1BHPuCA4/HubupiyH7eH47kWtNzH9xAMaNs91 lN0rir8mISrs22LSb9qn4C+QgUZLNrqHwq7sRChuZOcBFdmBE6pkTx7XGSp0Wc0fMji/ 6t7iCLx6LECybeL/rSoqPPuDmW8GS/cSahAh6QjvL9PGUBvtf7eSktVhVD+HsK6ir4Bo N3hrcSUMbZFxXCrRgtZrMyds6yIUeAtODwNPkLfjt2qyRZNK+znNHO5D4r87atbQoSkj 0hEA== X-Forwarded-Encrypted: i=1; AFNElJ/0wzmmOt0D6s1B2UZsv5x6Ln+gP7lz3VSpIXo8y7zF4wdJYOdy/7tdTaLIM32zWb34wgXQ51bBxHUNteA=@vger.kernel.org X-Gm-Message-State: AOJu0YyoMjqM4ep6wWjt/BCAsp29Hd1P2KPRtdgOnpX+I1IpjpC93GcQ GG77OAKTzA5GDgNeOxUECG+1ucyLzqrxDJ9UQTFvRhH5DD7bskB21ST1104HvP0ymargHEWE7GF K6ztL1boeDUn0Tw== X-Received: from edvh9.prod.google.com ([2002:aa7:de09:0:b0:695:de87:8924]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:268a:b0:674:5b2c:d42c with SMTP id 4fb4d7f45d1cf-696edc828fcmr6463779a12.3.1782122507560; Mon, 22 Jun 2026 03:01:47 -0700 (PDT) Date: Mon, 22 Jun 2026 10:01:32 +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-5-31f31367d420@google.com> Subject: [PATCH v2 05/13] perf/x86/intel: 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 , 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 former allows you to pass NUMA_NO_NODE. The former is going away and the latter works fine here so switch over. 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 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 7f0d515c07c54..bbc20a5beabb6 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -834,7 +834,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; } @@ -1090,9 +1090,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; wrmsr_on_cpu(cpu, MSR_IA32_PEBS_BASE, (u32)arch_pebs_base, -- 2.54.0