perf/x86/amd: Fix RDPMC index calculation for AMD family 15h
authorRobert Richter <[email protected]>
Fri, 15 Jun 2012 17:06:44 +0000 (19:06 +0200)
committerIngo Molnar <[email protected]>
Mon, 18 Jun 2012 09:14:35 +0000 (11:14 +0200)
commit76958a61e42fb6277a8431eb17e4bdb24176f1b7
treebac2ee9edf3ebc32d2f1594cb873aa2f67431d3d
parent4983955c049d1debe5f6bee3aeb54ff5942fcd39
perf/x86/amd: Fix RDPMC index calculation for AMD family 15h

The RDPMC index calculation is wrong for AMD family 15h
(X86_FEATURE_ PERFCTR_CORE set). This leads to a #GP when
accessing the counter:

 Pid: 2237, comm: syslog-ng Not tainted 3.5.0-rc1-perf-x86_64-standard-g130ff90 #135 AMD Pike/Pike
 RIP: 0010:[<ffffffff8100dc33>]  [<ffffffff8100dc33>] x86_perf_event_update+0x27/0x66

While the msr address offset is (index << 1) we must use index to
select the correct rdpmc.

Signed-off-by: Robert Richter <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Cc: Vince Weaver <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
arch/x86/kernel/cpu/perf_event.c