diff options
author | Stephane Eranian <eranian@google.com> | 2013-03-15 09:26:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-15 12:26:35 -0400 |
commit | 1d9d8639c063caf6efc2447f5f26aa637f844ff6 (patch) | |
tree | ab9c24ccfd8b464211b393ac8ae9cd6b964e9df3 | |
parent | a2362d24764a4e9a3187fc46b14e1d2cd0657700 (diff) |
perf,x86: fix kernel crash with PEBS/BTS after suspend/resume
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>
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel_ds.c | 8 | ||||
-rw-r--r-- | arch/x86/power/cpu.c | 2 | ||||
-rw-r--r-- | include/linux/perf_event.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c index 826054a4f2ee..0e9bdd3cb01e 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_ds.c +++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c | |||
@@ -729,3 +729,11 @@ void intel_ds_init(void) | |||
729 | } | 729 | } |
730 | } | 730 | } |
731 | } | 731 | } |
732 | |||
733 | void perf_restore_debug_store(void) | ||
734 | { | ||
735 | if (!x86_pmu.bts && !x86_pmu.pebs) | ||
736 | return; | ||
737 | |||
738 | init_debug_store_on_cpu(smp_processor_id()); | ||
739 | } | ||
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 120cee1c3f8d..3c68768d7a75 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/suspend.h> | 11 | #include <linux/suspend.h> |
12 | #include <linux/export.h> | 12 | #include <linux/export.h> |
13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
14 | #include <linux/perf_event.h> | ||
14 | 15 | ||
15 | #include <asm/pgtable.h> | 16 | #include <asm/pgtable.h> |
16 | #include <asm/proto.h> | 17 | #include <asm/proto.h> |
@@ -228,6 +229,7 @@ static void __restore_processor_state(struct saved_context *ctxt) | |||
228 | do_fpu_end(); | 229 | do_fpu_end(); |
229 | x86_platform.restore_sched_clock_state(); | 230 | x86_platform.restore_sched_clock_state(); |
230 | mtrr_bp_restore(); | 231 | mtrr_bp_restore(); |
232 | perf_restore_debug_store(); | ||
231 | } | 233 | } |
232 | 234 | ||
233 | /* Needed by apm.c */ | 235 | /* Needed by apm.c */ |
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index e47ee462c2f2..71caed8626be 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h | |||
@@ -758,6 +758,7 @@ extern void perf_event_enable(struct perf_event *event); | |||
758 | extern void perf_event_disable(struct perf_event *event); | 758 | extern void perf_event_disable(struct perf_event *event); |
759 | extern int __perf_event_disable(void *info); | 759 | extern int __perf_event_disable(void *info); |
760 | extern void perf_event_task_tick(void); | 760 | extern void perf_event_task_tick(void); |
761 | extern void perf_restore_debug_store(void); | ||
761 | #else | 762 | #else |
762 | static inline void | 763 | static inline void |
763 | perf_event_task_sched_in(struct task_struct *prev, | 764 | perf_event_task_sched_in(struct task_struct *prev, |
@@ -797,6 +798,7 @@ static inline void perf_event_enable(struct perf_event *event) { } | |||
797 | static inline void perf_event_disable(struct perf_event *event) { } | 798 | static inline void perf_event_disable(struct perf_event *event) { } |
798 | static inline int __perf_event_disable(void *info) { return -1; } | 799 | static inline int __perf_event_disable(void *info) { return -1; } |
799 | static inline void perf_event_task_tick(void) { } | 800 | static inline void perf_event_task_tick(void) { } |
801 | static inline void perf_restore_debug_store(void) { } | ||
800 | #endif | 802 | #endif |
801 | 803 | ||
802 | #define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x)) | 804 | #define perf_output_put(handle, x) perf_output_copy((handle), &(x), sizeof(x)) |