3.4-stable patches

added patches:
	perf-x86-fix-kernel-crash-with-pebs-bts-after-suspend-resume.patch

diff --git a/queue-3.4/perf-x86-fix-kernel-crash-with-pebs-bts-after-suspend-resume.patch b/queue-3.4/perf-x86-fix-kernel-crash-with-pebs-bts-after-suspend-resume.patch
new file mode 100644 (file)
index 0000000..3872ae6
--- /dev/null
+++ b/queue-3.4/perf-x86-fix-kernel-crash-with-pebs-bts-after-suspend-resume.patch
@@ -0,0 +1,80 @@
+From 1d9d8639c063caf6efc2447f5f26aa637f844ff6 Mon Sep 17 00:00:00 2001
+From: Stephane Eranian <eranian@google.com>
+Date: Fri, 15 Mar 2013 14:26:07 +0100
+Subject: perf,x86: fix kernel crash with PEBS/BTS after suspend/resume
+
+From: Stephane Eranian <eranian@google.com>
+
+commit 1d9d8639c063caf6efc2447f5f26aa637f844ff6 upstream.
+
+This patch fixes a kernel crash when using precise sampling (PEBS)
+after a suspend/resume. Turns out the CPU notifier code is not invoked
+on CPU0 (BP). Therefore, the DS_AREA (used by PEBS) is not restored properly
+by the kernel and keeps it power-on/resume value of 0 causing any PEBS
+measurement to crash when running on CPU0.
+
+The workaround is to add a hook in the actual resume code to restore
+the DS Area MSR value. It is invoked for all CPUS. So for all but CPU0,
+the DS_AREA will be restored twice but this is harmless.
+
+Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Stephane Eranian <eranian@google.com>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/cpu/perf_event_intel_ds.c |    8 ++++++++
+ arch/x86/power/cpu.c                      |    2 ++
+ include/linux/perf_event.h                |    2 ++
+ 3 files changed, 12 insertions(+)
+
+--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
++++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
+@@ -723,3 +723,11 @@ void intel_ds_init(void)
+               }
+       }
+ }
++
++void perf_restore_debug_store(void)
++{
++      if (!x86_pmu.bts && !x86_pmu.pebs)
++              return;
++
++      init_debug_store_on_cpu(smp_processor_id());
++}
+--- a/arch/x86/power/cpu.c
++++ b/arch/x86/power/cpu.c
+@@ -11,6 +11,7 @@
+ #include <linux/suspend.h>
+ #include <linux/export.h>
+ #include <linux/smp.h>
++#include <linux/perf_event.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/proto.h>
+@@ -227,6 +228,7 @@ static void __restore_processor_state(st
+       do_fpu_end();
+       x86_platform.restore_sched_clock_state();
+       mtrr_bp_restore();
++      perf_restore_debug_store();
+ }
+ 
+ /* Needed by apm.c */
+--- a/include/linux/perf_event.h
++++ b/include/linux/perf_event.h
+@@ -1290,6 +1290,7 @@ extern void perf_swevent_put_recursion_c
+ extern void perf_event_enable(struct perf_event *event);
+ extern void perf_event_disable(struct perf_event *event);
+ extern void perf_event_task_tick(void);
++extern void perf_restore_debug_store(void);
+ #else
+ static inline void
+ perf_event_task_sched_in(struct task_struct *prev,
+@@ -1328,6 +1329,7 @@ static inline void perf_swevent_put_recu
+ static inline void perf_event_enable(struct perf_event *event)                { }
+ static inline void perf_event_disable(struct perf_event *event)               { }
+ static inline void perf_event_task_tick(void)                         { }
++static inline void perf_restore_debug_store(void)                     { }
+ #endif
+ 
+ #define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x))

diff --git a/queue-3.4/series b/queue-3.4/series
index 35f136093caa532888138340995d966612ffb9d3..1f3666be1f65a04e97511efa504f72bf4ef0ee98 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -14,3 +14,4 @@ ext3-fix-format-string-issues.patch
 serial-8250_pci-add-support-for-another-kind-of-netmos-technology-pci-9835-multi-i-o-controller.patch
 tty-serial-fix-typo-arch_s5p6450.patch
 tty-do-not-reset-master-s-packet-mode.patch
+perf-x86-fix-kernel-crash-with-pebs-bts-after-suspend-resume.patch