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>
Subject: [Patch v7 17/24] perf/x86/intel: Refresh LBR stack for non-PEBS LBR events when needed
Date: Wed, 18 Nov 2026 11:14:46 +0800 [thread overview]
Message-ID: <20261118031453.1353625-18-dapeng1.mi@linux.intel.com> (raw)
In-Reply-To: <20261118031453.1353625-1-dapeng1.mi@linux.intel.com>
PEBS and non-PEBS events share the same LBR stack in cpuc->__lbr_stack.
In the PMI handler, the non-PEBS path refreshes the LBR state before the
PEBS buffer is drained.
When PEBS and non-PEBS LBR events overflow in the same PMI, draining the
PEBS buffer can overwrite the shared LBR stack with the PEBS snapshot.
This leaves stale LBR data from the PEBS record in place, so userspace
can see the wrong branch stack instead of the live LBR state at PMI
entry.
Track whether the LBR stack still contains the live state from PMI entry
with a cpuc->lbr_stack_live flag. The flag starts out clear on each pass
of the PMI handler and is set once the live LBR state has been read.
Draining PEBS records with LBR data clears it again, so a non-PEBS LBR
event re-reads the stack only when it is needed. Since the LBR state is
frozen for the duration of PMI handling, it only needs to be read once
for multiple non-PEBS LBR events in the same PMI.
Fixes: c22497f5838c ("perf/x86/intel: Support adaptive PEBS v4")
Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
---
arch/x86/events/intel/core.c | 18 ++++++++++++++----
arch/x86/events/intel/lbr.c | 1 +
arch/x86/events/perf_event.h | 1 +
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index 5491cd4f4c6f..aa7034c5ea41 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -4054,8 +4054,14 @@ static int handle_pmi_common(struct pt_regs *regs, u64 status)
perf_sample_data_init(&data, 0, last_period);
- if (has_branch_stack(event))
+ if (has_branch_stack(event)) {
+ if (!cpuc->lbr_stack_live) {
+ intel_pmu_lbr_read(cpu_lbr_stack(cpuc),
+ cpuc->lbr_counters);
+ cpuc->lbr_stack_live = true;
+ }
intel_pmu_lbr_save_brstack(&data, cpuc, event);
+ }
x86_pmu_clear_perf_regs(regs);
x86_pmu_update_perf_regs(event, &data, regs, false);
@@ -4111,12 +4117,16 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)
loops = 0;
again:
+ cpuc->lbr_stack_live = false;
/*
- * No need to read the LBR stack when all LBR users are PEBS events,
- * since the PEBS handler updates it.
+ * If PEBS can't record LBRs, draining PEBS can't overwrite the
+ * LBR stack, so read it here at PMI entry. Otherwise, it is read
+ * after PEBS draining when needed.
*/
- if (cpuc->lbr_users != cpuc->lbr_pebs_users)
+ if (cpuc->lbr_users > 0 && !intel_pmu_has_pebs_lbr(cpuc->pmu)) {
intel_pmu_lbr_read(cpu_lbr_stack(cpuc), cpuc->lbr_counters);
+ cpuc->lbr_stack_live = true;
+ }
/*
* Keep the LBR state frozen throughout PMI handling so that the PMI
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 3a282352b0d2..740d5a5ba4c3 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -1317,6 +1317,7 @@ void intel_pmu_store_pebs_lbrs(struct lbr_entry *lbr)
intel_pmu_store_lbr(lbr, cpu_lbr_stack(cpuc));
intel_pmu_lbr_filter(cpuc, cpu_lbr_stack(cpuc), cpuc->lbr_counters);
+ cpuc->lbr_stack_live = false;
}
/*
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
index 8d64bfcdc82d..4e6cf5c1e865 100644
--- a/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@ -525,6 +525,7 @@ struct cpu_hw_events {
/*
* Intel LBR bits
*/
+ bool lbr_stack_live; /* If LBR stack holds the live LBR state */
int lbr_users;
int lbr_pebs_users;
u64 __lbr_stack[LBR_STACK_SIZE / sizeof(u64)];
--
2.34.1
next prev parent reply other threads:[~2026-11-18 3:24 UTC|newest]
Thread overview: 56+ 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 4:10 ` bot+bpf-ci
2026-11-18 6:01 ` Mi, Dapeng
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 ` [Patch v7 12/24] perf/x86/intel: Use a dedicated LBR stack for BPF snapshotting Dapeng Mi
2026-11-18 3:43 ` 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 4:10 ` bot+bpf-ci
2026-11-18 6:28 ` Mi, Dapeng
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 6:32 ` Mi, Dapeng
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 ` Dapeng Mi [this message]
2026-11-18 4:09 ` [Patch v7 17/24] perf/x86/intel: Refresh LBR stack for non-PEBS LBR events when needed sashiko-bot
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 6:48 ` Mi, Dapeng
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-18-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=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.