]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
perf/x86: Correctly use FEATURE_PDCM
authorPeter Zijlstra <peterz@infradead.org>
Mon, 3 Feb 2014 13:29:03 +0000 (14:29 +0100)
committerJiri Slaby <jslaby@suse.cz>
Sat, 10 Jan 2015 11:40:17 +0000 (12:40 +0100)
commit05d75f8aa3a9227b5180354671dff77c9a72d0bf
tree848f6d23473d2b8cd2a20bca230dd3ee6b4107f1
parente1c34dac913e87ee8d03c06d7a328a7c2137cafb
perf/x86: Correctly use FEATURE_PDCM

commit c9b08884c9c98929ec2d8abafd78e89062d01ee7 upstream.

The current code simply assumes Intel Arch PerfMon v2+ to have
the IA32_PERF_CAPABILITIES MSR; the SDM specifies that we should check
CPUID[1].ECX[15] (aka, FEATURE_PDCM) instead.

This was found by KVM which implements v2+ but didn't provide the
capabilities MSR. Change the code to DTRT; KVM will also implement the
MSR and return 0.

Cc: pbonzini@redhat.com
Reported-by: "Michael S. Tsirkin" <mst@redhat.com>
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20140203132903.GI8874@twins.programming.kicks-ass.net
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
arch/x86/kernel/cpu/perf_event_intel.c