aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephane Eranian <eranian@google.com>2013-03-15 09:26:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-15 12:26:35 -0400
commit1d9d8639c063caf6efc2447f5f26aa637f844ff6 (patch)
treeab9c24ccfd8b464211b393ac8ae9cd6b964e9df3 /include
parenta2362d24764a4e9a3187fc46b14e1d2cd0657700 (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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/perf_event.h2
1 files changed, 2 insertions, 0 deletions
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);
758extern void perf_event_disable(struct perf_event *event); 758extern void perf_event_disable(struct perf_event *event);
759extern int __perf_event_disable(void *info); 759extern int __perf_event_disable(void *info);
760extern void perf_event_task_tick(void); 760extern void perf_event_task_tick(void);
761extern void perf_restore_debug_store(void);
761#else 762#else
762static inline void 763static inline void
763perf_event_task_sched_in(struct task_struct *prev, 764perf_event_task_sched_in(struct task_struct *prev,
@@ -797,6 +798,7 @@ static inline void perf_event_enable(struct perf_event *event) { }
797static inline void perf_event_disable(struct perf_event *event) { } 798static inline void perf_event_disable(struct perf_event *event) { }
798static inline int __perf_event_disable(void *info) { return -1; } 799static inline int __perf_event_disable(void *info) { return -1; }
799static inline void perf_event_task_tick(void) { } 800static inline void perf_event_task_tick(void) { }
801static 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))