Commit 974fc943 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f6cdaeb0 263f5eca

arch/x86/events/amd/core.c

+1 −2
Original line number Diff line number Diff line
@@ -923,6 +923,7 @@ static int amd_pmu_v2_handle_irq(struct pt_regs *regs) 


		/* Event overflow */

		handled++;

		status &= ~mask;

		perf_sample_data_init(&data, 0, hwc->last_period);



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


		if (perf_event_overflow(event, &data, regs))

			x86_pmu_stop(event, 0);



		status &= ~mask;

	}



	/*