diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 5a313921c651..529f8730cb15 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -27,6 +27,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -120,3 +121,8 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_fork_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_ttwu_cond); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_schedule_bug); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_exec); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_oops_enter); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_oops_exit); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_size_check); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_format_check); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_dump_buffer); diff --git a/include/trace/hooks/ftrace_dump.h b/include/trace/hooks/ftrace_dump.h new file mode 100644 index 000000000000..ce33479cb17b --- /dev/null +++ b/include/trace/hooks/ftrace_dump.h @@ -0,0 +1,50 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM ftrace_dump + +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_FTRACE_DUMP_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_FTRACE_DUMP_H + +#include +#include + +#include +#include + +#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS) + +DECLARE_HOOK(android_vh_ftrace_oops_enter, + TP_PROTO(bool *ftrace_check), + TP_ARGS(ftrace_check)); + +DECLARE_HOOK(android_vh_ftrace_oops_exit, + TP_PROTO(bool *ftrace_check), + TP_ARGS(ftrace_check)); + +DECLARE_HOOK(android_vh_ftrace_size_check, + TP_PROTO(unsigned long size, bool *ftrace_check), + TP_ARGS(size, ftrace_check)); + +DECLARE_HOOK(android_vh_ftrace_format_check, + TP_PROTO(bool *ftrace_check), + TP_ARGS(ftrace_check)); + +DECLARE_HOOK(android_vh_ftrace_dump_buffer, + TP_PROTO(struct trace_seq *trace_buf, bool *dump_printk), + TP_ARGS(trace_buf, dump_printk)); + +#else + +#define trace_android_vh_ftrace_oops_enter(ftrace_check) +#define trace_android_vh_ftrace_oops_exit(ftrace_check) +#define trace_android_vh_ftrace_size_check(size, ftrace_check) +#define trace_android_vh_ftrace_format_check(ftrace_check) +#define trace_android_vh_ftrace_dump_buffer(trace_buf, dump_printk) + +#endif + +#endif /* _TRACE_HOOK_FTRACE_DUMP_H */ +/* This part must be outside protection */ +#include diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 3119d68d012d..6cd0949bc3f4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -48,6 +48,7 @@ #include #include #include +#include #include "trace.h" #include "trace_output.h" @@ -9201,8 +9202,17 @@ static __init int tracer_init_tracefs(void) static int trace_panic_handler(struct notifier_block *this, unsigned long event, void *unused) { + bool ftrace_check = false; + + trace_android_vh_ftrace_oops_enter(&ftrace_check); + + if (ftrace_check) + return NOTIFY_OK; + if (ftrace_dump_on_oops) ftrace_dump(ftrace_dump_on_oops); + + trace_android_vh_ftrace_oops_exit(&ftrace_check); return NOTIFY_OK; } @@ -9216,6 +9226,13 @@ static int trace_die_handler(struct notifier_block *self, unsigned long val, void *data) { + bool ftrace_check = false; + + trace_android_vh_ftrace_oops_enter(&ftrace_check); + + if (ftrace_check) + return NOTIFY_OK; + switch (val) { case DIE_OOPS: if (ftrace_dump_on_oops) @@ -9224,6 +9241,8 @@ static int trace_die_handler(struct notifier_block *self, default: break; } + + trace_android_vh_ftrace_oops_exit(&ftrace_check); return NOTIFY_OK; } @@ -9248,6 +9267,8 @@ static struct notifier_block trace_die_notifier = { void trace_printk_seq(struct trace_seq *s) { + bool dump_printk = true; + /* Probably should print a warning here. */ if (s->seq.len >= TRACE_MAX_PRINT) s->seq.len = TRACE_MAX_PRINT; @@ -9263,7 +9284,9 @@ trace_printk_seq(struct trace_seq *s) /* should be zero ended, but we are paranoid. */ s->buffer[s->seq.len] = 0; - printk(KERN_TRACE "%s", s->buffer); + trace_android_vh_ftrace_dump_buffer(s, &dump_printk); + if (dump_printk) + printk(KERN_TRACE "%s", s->buffer); trace_seq_init(s); } @@ -9296,6 +9319,8 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) unsigned int old_userobj; unsigned long flags; int cnt = 0, cpu; + bool ftrace_check = false; + unsigned long size; /* Only allow one dump user at a time. */ if (atomic_inc_return(&dump_running) != 1) { @@ -9324,6 +9349,8 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) for_each_tracing_cpu(cpu) { atomic_inc(&per_cpu_ptr(iter.array_buffer->data, cpu)->disabled); + size = ring_buffer_size(iter.array_buffer->buffer, cpu); + trace_android_vh_ftrace_size_check(size, &ftrace_check); } old_userobj = tr->trace_flags & TRACE_ITER_SYM_USEROBJ; @@ -9331,6 +9358,9 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) /* don't look at user memory in panic mode */ tr->trace_flags &= ~TRACE_ITER_SYM_USEROBJ; + if (ftrace_check) + goto out_enable; + switch (oops_dump_mode) { case DUMP_ALL: iter.cpu_file = RING_BUFFER_ALL_CPUS; @@ -9361,6 +9391,7 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) */ while (!trace_empty(&iter)) { + ftrace_check = true; if (!cnt) printk(KERN_TRACE "---------------------------------\n"); @@ -9368,7 +9399,9 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) cnt++; trace_iterator_reset(&iter); - iter.iter_flags |= TRACE_FILE_LAT_FMT; + trace_android_vh_ftrace_format_check(&ftrace_check); + if (ftrace_check) + iter.iter_flags |= TRACE_FILE_LAT_FMT; if (trace_find_next_entry_inc(&iter) != NULL) { int ret;