The patch titled
x86_64: fix oprofile SMP
has been added to the -mm tree. Its filename is
x86_64-fix-oprofile-smp.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: x86_64: fix oprofile SMP
From: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
This fixes oprofile being broken on x86-64 SMP. The current reservation
runs on all CPUs, but the ones following the first, will fail since the
reservation bitmap has an 1 in the MSR entry.
The reservation code should really run once, and their addresses used on
other CPUs. There are other solutions to this, but this is the simplest
and shorter one that came in my mind. Tested in my dual Opteron 252, and
working fine here.
Signed-off-by: Davide Libenzi <davidel@xxxxxxxxxxxxxxx>
Cc: Benjamin LaHaise <bcrl@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/oprofile/nmi_int.c | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff -puN arch/i386/oprofile/nmi_int.c~x86_64-fix-oprofile-smp arch/i386/oprofile/nmi_int.c
--- a/arch/i386/oprofile/nmi_int.c~x86_64-fix-oprofile-smp
+++ a/arch/i386/oprofile/nmi_int.c
@@ -130,8 +130,19 @@ static void nmi_cpu_save_registers(struc
static void nmi_save_registers(void * dummy)
{
int cpu = smp_processor_id();
- struct op_msrs * msrs = &cpu_msrs[cpu];
- model->fill_in_addresses(msrs);
+ struct op_msrs *msrs = &cpu_msrs[cpu];
+
+ /*
+ * Use the CPU#0 already allocated addresses as reference.
+ */
+ if (cpu != 0) {
+ const struct op_msrs *rmsrs = &cpu_msrs[0];
+
+ memcpy(msrs->counters, rmsrs->counters,
+ model->num_counters * sizeof(msrs->counters[0]));
+ memcpy(msrs->controls, rmsrs->controls,
+ model->num_controls * sizeof(msrs->controls[0]));
+ }
nmi_cpu_save_registers(msrs);
}
@@ -195,6 +206,7 @@ static struct notifier_block profile_exc
static int nmi_setup(void)
{
int err=0;
+ struct op_msrs *msrs;
if (!allocate_msrs())
return -ENOMEM;
@@ -203,6 +215,14 @@ static int nmi_setup(void)
free_msrs();
return err;
}
+ /*
+ * MSR reservation should happen only once with the current API,
+ * otherwise CPU other then the first would fail to allocate.
+ * We do it here, and then we propagate the CPU#0 addresses to
+ * other CPUs.
+ */
+ msrs = &cpu_msrs[0];
+ model->fill_in_addresses(msrs);
/* We need to serialize save and setup for HT because the subset
* of msrs are distinct for save and setup operations
_
Patches currently in -mm which might be from davidel@xxxxxxxxxxxxxxx are
origin.patch
simplify-compat_sys_timerfd.patch
x86_64-fix-oprofile-smp.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
