From: Dapeng Mi <dapeng1.mi@linux.intel.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Andi Kleen <ak@linux.intel.com>,
Eranian Stephane <eranian@google.com>,
Sandipan Das <sandipan.das@amd.com>,
Andrii Nakryiko <andrii@kernel.org>, Song Liu <song@kernel.org>,
Ravi Bangoria <ravi.bangoria@amd.com>,
Ananth Narayan <ananth.narayan@amd.com>
Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
bpf@vger.kernel.org, Dapeng Mi <dapeng1.mi@intel.com>,
Zide Chen <zide.chen@intel.com>,
Falcon Thomas <thomas.falcon@intel.com>,
Xudong Hao <xudong.hao@intel.com>,
Dapeng Mi <dapeng1.mi@linux.intel.com>,
Sashiko <sashiko-bot@kernel.org>
Subject: [Patch v7 12/24] perf/x86/intel: Use a dedicated LBR stack for BPF snapshotting
Date: Wed, 18 Nov 2026 11:14:41 +0800 [thread overview]
Message-ID: <20261118031453.1353625-13-dapeng1.mi@linux.intel.com> (raw)
In-Reply-To: <20261118031453.1353625-1-dapeng1.mi@linux.intel.com>
BPF LBR snapshotting currently reuses the default LBR stack
(cpuc->__lbr_stack) when storing sampled data. This is unsafe when the
BPF helper runs in PMI context via bpf_overflow_handler(): it can
overwrite the cached LBR state for active PEBS LBR events, causing
incorrect LBR data to be reported to userspace. When the PEBS and BPF
stacks have different depths, this can also lead to out-of-bounds reads
when the LBR stack is later exported.
Use a dedicated LBR stack for BPF snapshotting so the BPF path no
longer clobbers the shared LBR state used by other perf events.
Fixes: c22ac2a3d4bd ("perf: Enable branch record for software events")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
---
arch/x86/events/intel/core.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 357c8eb7ee08..b560f2e96848 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -2819,17 +2819,26 @@ static void intel_pmu_enable_all(int added)
__intel_pmu_enable_all(false);
}
+struct lbr_snapshot {
+ u64 __lbr_stack[LBR_STACK_SIZE / sizeof(u64)];
+ u64 counters[MAX_LBR_ENTRIES];
+};
+static DEFINE_PER_CPU(struct lbr_snapshot, lbr_snapshot);
+
static noinline int
__intel_pmu_snapshot_branch_stack(struct perf_branch_entry *entries,
unsigned int cnt, unsigned long flags,
int pmu_enabled, int lbr_enabled)
{
struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
+ struct lbr_snapshot *bpf = this_cpu_ptr(&lbr_snapshot);
+ struct perf_branch_stack *lbr_stack;
- intel_pmu_lbr_read(cpu_lbr_stack(cpuc), cpuc->lbr_counters);
- cnt = min_t(unsigned int, cnt, cpu_lbr_stack(cpuc)->nr);
+ lbr_stack = (struct perf_branch_stack *)bpf->__lbr_stack;
+ intel_pmu_lbr_read(lbr_stack, bpf->counters);
+ cnt = min_t(unsigned int, cnt, lbr_stack->nr);
- memcpy(entries, cpu_lbr_stack(cpuc)->entries,
+ memcpy(entries, lbr_stack->entries,
sizeof(struct perf_branch_entry) * cnt);
/*
--
2.34.1
next prev parent reply other threads:[~2026-11-18 3:23 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 3:14 [Patch v7 00/24] perf/x86: Fix multiple LBR sampling issues Dapeng Mi
2026-11-18 3:14 ` [Patch v7 01/24] perf/x86: Disable LBR if x86_pmu.lbr_nr exceeds MAX_LBR_ENTRIES Dapeng Mi
2026-11-18 3:50 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 02/24] perf/x86/intel: Validate LBR XSAVE state before updating LBR stack Dapeng Mi
2026-11-18 3:48 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 03/24] perf/x86/amd/lbr: Limit branch snapshots to valid entries Dapeng Mi
2026-11-18 3:34 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 04/24] perf/x86/intel: " Dapeng Mi
2026-11-18 3:37 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 05/24] perf/x86: Add lbr_enabled to track LBR state Dapeng Mi
2026-11-18 3:58 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 06/24] perf/x86/amd: Avoid re-enabling PMU and LBR for BPF when disabled Dapeng Mi
2026-11-18 3:43 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 07/24] perf/x86/intel: Add helper to enable PMU without LBR Dapeng Mi
2026-11-18 3:28 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 08/24] perf/x86/intel: Avoid re-enabling PMU and LBR for BPF when disabled Dapeng Mi
2026-11-18 3:39 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 09/24] perf/x86/intel: Keep LBR frozen throughout PMI handling Dapeng Mi
2026-11-18 3:42 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 10/24] perf: Add counted-bounds tracking for perf_branch_stack Dapeng Mi
2026-11-18 3:35 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 11/24] perf/x86/intel: Allow LBR read helpers to operate on explicit stacks Dapeng Mi
2026-11-18 3:32 ` sashiko-bot
2026-11-18 3:14 ` Dapeng Mi [this message]
2026-11-18 3:43 ` [Patch v7 12/24] perf/x86/intel: Use a dedicated LBR stack for BPF snapshotting sashiko-bot
2026-11-18 3:14 ` [Patch v7 13/24] perf/x86/intel: Always snapshot live hardware LBR state for BPF Dapeng Mi
2026-11-18 3:46 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 14/24] perf/x86/intel: Account lbr_pebs_users for arch-PEBS events Dapeng Mi
2026-11-18 3:34 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 15/24] perf/x86/intel: Set PERF_EV_CAP_SIBLING for pure branch counter events Dapeng Mi
2026-11-18 4:05 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 16/24] perf/x86/intel: Account LBR user counts " Dapeng Mi
2026-11-18 3:49 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 17/24] perf/x86/intel: Refresh LBR stack for non-PEBS LBR events when needed Dapeng Mi
2026-11-18 3:14 ` [Patch v7 18/24] perf/x86/intel: Fix draining of un-overflowed PEBS buffer in PMI handler Dapeng Mi
2026-11-18 3:46 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 19/24] perf/x86/intel: Drain PEBS buffer for branch events with PEBS LBR users Dapeng Mi
2026-11-18 3:52 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 20/24] perf/x86/intel: Clear raw LBR counters in the LBR stack Dapeng Mi
2026-11-18 3:50 ` sashiko-bot
2026-11-18 3:54 ` bot+bpf-ci
2026-11-18 3:14 ` [Patch v7 21/24] perf/x86/intel: Refresh LBR stack for LBR counter events in PMI handler Dapeng Mi
2026-11-18 3:45 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 22/24] perf/x86/intel: Pass LBR stack size into intel_pmu_store_lbr() Dapeng Mi
2026-11-18 3:46 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 23/24] perf/core: Don't mutate shared branch stack depth Dapeng Mi
2026-11-18 3:51 ` sashiko-bot
2026-11-18 3:14 ` [Patch v7 24/24] perf/x86/intel: Fix incorrect PERF_METRICS overflow bit clearing Dapeng Mi
2026-11-18 3:46 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118031453.1353625-13-dapeng1.mi@linux.intel.com \
--to=dapeng1.mi@linux.intel.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=ananth.narayan@amd.com \
--cc=andrii@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=dapeng1.mi@intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=ravi.bangoria@amd.com \
--cc=sandipan.das@amd.com \
--cc=sashiko-bot@kernel.org \
--cc=song@kernel.org \
--cc=thomas.falcon@intel.com \
--cc=xudong.hao@intel.com \
--cc=zide.chen@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox