[Patch v7 20/24] perf/x86/intel: Clear raw LBR counters in the LBR stack
From: Dapeng Mi
Date: Tue Nov 17 2026 - 22:25:20 EST
The raw branch counters are stored in the reserved field of each LBR
entry. The branch counters path clears that field after reordering
the counters, but the BPF snapshot path and the regular branch stack
path leave the raw values in place, so they leak to userspace.
Clear the raw counters on those paths too.
Fixes: 33744916196b ("perf/x86/intel: Support branch counters logging")
Reported-by: Sashiko <sashiko-bot@xxxxxxxxxx>
Signed-off-by: Dapeng Mi <dapeng1.mi@xxxxxxxxxxxxxxx>
---
arch/x86/events/intel/core.c | 1 +
arch/x86/events/intel/lbr.c | 13 +++++++++++++
arch/x86/events/perf_event.h | 2 ++
3 files changed, 16 insertions(+)
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index ccd2c57931b3..fc672bc69ae3 100644
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -2836,6 +2836,7 @@ __intel_pmu_snapshot_branch_stack(struct perf_branch_entry *entries,
lbr_stack = (struct perf_branch_stack *)bpf->__lbr_stack;
intel_pmu_lbr_read(lbr_stack, bpf->counters);
+ intel_pmu_lbr_clear_raw_counters(lbr_stack);
cnt = min_t(unsigned int, cnt, lbr_stack->nr);
memcpy(entries, lbr_stack->entries,
diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 740d5a5ba4c3..4736debffb0b 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -991,6 +991,18 @@ static void intel_pmu_lbr_counters_reorder(struct cpu_hw_events *cpuc,
}
}
+void intel_pmu_lbr_clear_raw_counters(struct perf_branch_stack *lbr_stack)
+{
+ int i;
+
+ if (!(x86_pmu.flags & PMU_FL_BR_CNTR))
+ return;
+
+ /* The reserved field holds the raw branch counters. */
+ for (i = 0; i < lbr_stack->nr; i++)
+ lbr_stack->entries[i].reserved = 0;
+}
+
void intel_pmu_lbr_save_brstack(struct perf_sample_data *data,
struct cpu_hw_events *cpuc,
struct perf_event *event)
@@ -1001,6 +1013,7 @@ void intel_pmu_lbr_save_brstack(struct perf_sample_data *data,
return;
}
+ intel_pmu_lbr_clear_raw_counters(cpu_lbr_stack(cpuc));
perf_sample_save_brstack(data, event, cpu_lbr_stack(cpuc), NULL);
}
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h
index 4e6cf5c1e865..733123fc4ffe 100644
--- a/arch/x86/events/perf_event.h
+++ b/arch/x86/events/perf_event.h
@@ -1986,6 +1986,8 @@ void intel_pmu_store_pebs_lbrs(struct lbr_entry *lbr);
void intel_pebs_init(void);
+void intel_pmu_lbr_clear_raw_counters(struct perf_branch_stack *lbr_stack);
+
void intel_pmu_lbr_save_brstack(struct perf_sample_data *data,
struct cpu_hw_events *cpuc,
struct perf_event *event);
--
2.34.1