Commit 6c977aad authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

i386: Fix K8/core2 oprofile on multiple CPUs

Only try to allocate MSRs once instead of for every CPU.

This assumes the MSRs are the same on all CPUs which is currently
true. P4-HT is a special case for different SMT threads, but the code
always saves/restores all MSRs so it works identical.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4c87b948
...@@ -131,7 +131,6 @@ static void nmi_save_registers(void * dummy) ...@@ -131,7 +131,6 @@ static void nmi_save_registers(void * dummy)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
struct op_msrs * msrs = &cpu_msrs[cpu]; struct op_msrs * msrs = &cpu_msrs[cpu];
model->fill_in_addresses(msrs);
nmi_cpu_save_registers(msrs); nmi_cpu_save_registers(msrs);
} }
...@@ -195,6 +194,7 @@ static struct notifier_block profile_exceptions_nb = { ...@@ -195,6 +194,7 @@ static struct notifier_block profile_exceptions_nb = {
static int nmi_setup(void) static int nmi_setup(void)
{ {
int err=0; int err=0;
int cpu;
if (!allocate_msrs()) if (!allocate_msrs())
return -ENOMEM; return -ENOMEM;
...@@ -207,6 +207,13 @@ static int nmi_setup(void) ...@@ -207,6 +207,13 @@ static int nmi_setup(void)
/* We need to serialize save and setup for HT because the subset /* We need to serialize save and setup for HT because the subset
* of msrs are distinct for save and setup operations * of msrs are distinct for save and setup operations
*/ */
/* Assume saved/restored counters are the same on all CPUs */
model->fill_in_addresses(&cpu_msrs[0]);
for_each_possible_cpu (cpu) {
if (cpu != 0)
cpu_msrs[cpu] = cpu_msrs[0];
}
on_each_cpu(nmi_save_registers, NULL, 0, 1); on_each_cpu(nmi_save_registers, NULL, 0, 1);
on_each_cpu(nmi_cpu_setup, NULL, 0, 1); on_each_cpu(nmi_cpu_setup, NULL, 0, 1);
nmi_enabled = 1; nmi_enabled = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment