summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2023-04-26 20:05:27 -0700
committerPeter Zijlstra <peterz@infradead.org>2023-05-08 10:58:26 +0200
commit90befef5a9e820ccccc33181ec14c015980300cc (patch)
tree077b9e90c550e0c05e7a54139bb171e5aafae932 /arch/x86
parent1d1bfe30dad50d4bea83cd38d73c441972ea0173 (diff)
perf/x86: Fix missing sample size update on AMD BRS
It missed to convert a PERF_SAMPLE_BRANCH_STACK user to call the new perf_sample_save_brstack() helper in order to update the dyn_size. This affects AMD Zen3 machines with the branch-brs event. Fixes: eb55b455ef9c ("perf/core: Add perf_sample_save_brstack() helper") Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20230427030527.580841-1-namhyung@kernel.org
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/events/core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index d096b04bf80e..9d248703cbdd 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1703,10 +1703,8 @@ int x86_pmu_handle_irq(struct pt_regs *regs)
perf_sample_data_init(&data, 0, event->hw.last_period);
- if (has_branch_stack(event)) {
- data.br_stack = &cpuc->lbr_stack;
- data.sample_flags |= PERF_SAMPLE_BRANCH_STACK;
- }
+ if (has_branch_stack(event))
+ perf_sample_save_brstack(&data, event, &cpuc->lbr_stack);
if (perf_event_overflow(event, &data, regs))
x86_pmu_stop(event, 0);