diff options
| -rw-r--r-- | drivers/coresight/coresight-event.c | 23 | ||||
| -rw-r--r-- | include/trace/events/exception.h | 17 | ||||
| -rw-r--r-- | kernel/panic.c | 2 |
3 files changed, 36 insertions, 6 deletions
diff --git a/drivers/coresight/coresight-event.c b/drivers/coresight/coresight-event.c index 6d51e07fd303..f64eaf1b0a75 100644 --- a/drivers/coresight/coresight-event.c +++ b/drivers/coresight/coresight-event.c @@ -25,10 +25,10 @@ static int event_abort_set(const char *val, struct kernel_param *kp); module_param_call(event_abort_enable, event_abort_set, param_get_int, &event_abort_enable, 0644); -static int event_abort_on_panic = 1; +static int event_abort_early_panic = 1; static int event_abort_on_panic_set(const char *val, struct kernel_param *kp); -module_param_call(event_abort_on_panic, event_abort_on_panic_set, param_get_int, - &event_abort_on_panic, 0644); +module_param_call(event_abort_early_panic, event_abort_on_panic_set, + param_get_int, &event_abort_early_panic, 0644); static void event_abort_user_fault(void *ignore, struct task_struct *task, @@ -125,12 +125,23 @@ static int event_abort_on_panic_set(const char *val, struct kernel_param *kp) return ret; } - if (event_abort_on_panic) + if (event_abort_early_panic) { + unregister_trace_kernel_panic_late(event_abort_kernel_panic, + NULL); ret = register_trace_kernel_panic(event_abort_kernel_panic, NULL); - else + if (ret) + goto err; + } else { unregister_trace_kernel_panic(event_abort_kernel_panic, NULL); - + ret = register_trace_kernel_panic_late(event_abort_kernel_panic, + NULL); + if (ret) + goto err; + } + return 0; +err: + pr_err("coresight_event: error registering panic event %d\n", ret); return ret; } diff --git a/include/trace/events/exception.h b/include/trace/events/exception.h index 9a2924d812a4..19ec1bd97f9d 100644 --- a/include/trace/events/exception.h +++ b/include/trace/events/exception.h @@ -101,6 +101,23 @@ TRACE_EVENT(kernel_panic, TP_printk("dummy:%ld", __entry->dummy) ); +TRACE_EVENT(kernel_panic_late, + + TP_PROTO(long dummy), + + TP_ARGS(dummy), + + TP_STRUCT__entry( + __field(long, dummy) + ), + + TP_fast_assign( + __entry->dummy = dummy; + ), + + TP_printk("dummy:%ld", __entry->dummy) +); + #endif #include <trace/define_trace.h> diff --git a/kernel/panic.c b/kernel/panic.c index 8537350f9a23..25b00292ba97 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -136,6 +136,8 @@ void panic(const char *fmt, ...) atomic_notifier_call_chain(&panic_notifier_list, 0, buf); + trace_kernel_panic_late(0); + bust_spinlocks(0); if (!panic_blink) |