Commit 4749f819 authored May 03, 2018 by Kan Liang Committed by Ingo Molnar May 31, 2018

perf/x86/intel/uncore: Correct fixed counter index check in generic code



There is no index which is bigger than UNCORE_PMC_IDX_FIXED. The only
exception is client IMC uncore, which has been specially handled.
For generic code, it is not correct to use >= to check fixed counter.
The code quality issue will bring problem when a new counter index is
introduced.

Signed-off-by: Kan Liang <kan.liang@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: acme@kernel.org
Cc: eranian@google.com
Link: http://lkml.kernel.org/r/1525371913-10597-3-git-send-email-kan.liang@intel.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent d71f11c0

arch/x86/events/intel/uncore.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ void uncore_perf_event_update(struct intel_uncore_box box, struct perf_event e
		u64 prev_count, new_count, delta;
		int shift;

		if (event->hw.idx >= UNCORE_PMC_IDX_FIXED)
		if (event->hw.idx == UNCORE_PMC_IDX_FIXED)
		shift = 64 - uncore_fixed_ctr_bits(box);
		else
		shift = 64 - uncore_perf_ctr_bits(box);