Skip to content

Commit 974fc94

Browse files
committed
Merge tag 'perf_urgent_for_v6.3_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fix from Borislav Petkov: - Properly clear perf event status tracking in the AMD perf event overflow handler * tag 'perf_urgent_for_v6.3_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/amd/core: Always clear status for idx
2 parents f6cdaeb + 263f5ec commit 974fc94

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/x86/events/amd/core.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,7 @@ static int amd_pmu_v2_handle_irq(struct pt_regs *regs)
923923

924924
/* Event overflow */
925925
handled++;
926+
status &= ~mask;
926927
perf_sample_data_init(&data, 0, hwc->last_period);
927928

928929
if (!x86_perf_event_set_period(event))
@@ -933,8 +934,6 @@ static int amd_pmu_v2_handle_irq(struct pt_regs *regs)
933934

934935
if (perf_event_overflow(event, &data, regs))
935936
x86_pmu_stop(event, 0);
936-
937-
status &= ~mask;
938937
}
939938

940939
/*

0 commit comments

Comments
 (0)