Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc5fb2b5 authored by Robert Richter's avatar Robert Richter Committed by Ingo Molnar
Browse files

perf/x86-ibs: Catch spurious interrupts after stopping IBS 



After disabling IBS there could be still incomming NMIs with samples
that even have the valid bit cleared. Mark all this NMIs as handled to
avoid spurious interrupt messages.

Signed-off-by: default avatarRobert Richter <robert.richter@amd.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1333390758-10893-12-git-send-email-robert.richter@amd.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c9574fe0

arch/x86/kernel/cpu/perf_event_amd_ibs.c

+7 −5
Original line number Diff line number Diff line
@@ -473,11 +473,13 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) 
	u64 *buf, *config, period;



	if (!test_bit(IBS_STARTED, pcpu->state)) {

		/* Catch spurious interrupts after stopping IBS: */

		if (!test_and_clear_bit(IBS_STOPPING, pcpu->state))

			return 0;

		rdmsrl(perf_ibs->msr, *ibs_data.regs);

		return (*ibs_data.regs & perf_ibs->valid_mask) ? 1 : 0;

		/*

		 * Catch spurious interrupts after stopping IBS: After

		 * disabling IBS there could be still incomming NMIs

		 * with samples that even have the valid bit cleared.

		 * Mark all this NMIs as handled.

		 */

		return test_and_clear_bit(IBS_STOPPING, pcpu->state) ? 1 : 0;

	}



	msr = hwc->config_base;