From 1a094aba37bd7db038b8fc719833eb553361e7da Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Jan 2023 16:18:16 +0000 Subject: [PATCH] Revert "ANDROID: ftrace: vendor hook for ftrace dump on oops" This reverts commit fbbc48ef1854f36aba48538b3034c884878d9a65 as it conflicts with the ftrace rewrite in this area in 6.2-rc1. If these hooks are really needed (why would a driver need to ever touch ftrace buffers????) then they can be added back later. Bug: 177387994 Cc: Prateek Sood Cc: Mukesh Ojha Signed-off-by: Greg Kroah-Hartman Change-Id: If3a8149b3358c4376b6533b2a2d3d5e8a8a59532 --- drivers/android/vendor_hooks.c | 6 ----- include/trace/hooks/ftrace_dump.h | 36 ------------------------------ kernel/trace/trace.c | 37 ++----------------------------- 3 files changed, 2 insertions(+), 77 deletions(-) delete mode 100644 include/trace/hooks/ftrace_dump.h diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 1f1a6b0a1cb7..ee2ab26fc5ff 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -60,11 +59,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_irqs_disable); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_irqs_enable); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_attach); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_cgroup_online); -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); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_fill_prdt); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_prepare_command); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_update_sysfs); diff --git a/include/trace/hooks/ftrace_dump.h b/include/trace/hooks/ftrace_dump.h deleted file mode 100644 index 3d0b980ee85e..000000000000 --- a/include/trace/hooks/ftrace_dump.h +++ /dev/null @@ -1,36 +0,0 @@ -/* 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 - -struct trace_seq; - -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)); - -#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 68e21dd4df18..5cfc95a52bc3 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -49,7 +49,6 @@ #include #include #include -#include #include "trace.h" #include "trace_output.h" @@ -9859,17 +9858,8 @@ fs_initcall(tracer_init_tracefs); 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; } @@ -9883,13 +9873,6 @@ 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) @@ -9898,8 +9881,6 @@ static int trace_die_handler(struct notifier_block *self, default: break; } - - trace_android_vh_ftrace_oops_exit(&ftrace_check); return NOTIFY_OK; } @@ -9924,8 +9905,6 @@ 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; @@ -9941,9 +9920,7 @@ trace_printk_seq(struct trace_seq *s) /* should be zero ended, but we are paranoid. */ s->buffer[s->seq.len] = 0; - trace_android_vh_ftrace_dump_buffer(s, &dump_printk); - if (dump_printk) - printk(KERN_TRACE "%s", s->buffer); + printk(KERN_TRACE "%s", s->buffer); trace_seq_init(s); } @@ -9982,8 +9959,6 @@ 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) { @@ -10008,8 +9983,6 @@ 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; @@ -10017,9 +9990,6 @@ 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; @@ -10050,7 +10020,6 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) */ while (!trace_empty(&iter)) { - ftrace_check = true; if (!cnt) printk(KERN_TRACE "---------------------------------\n"); @@ -10058,9 +10027,7 @@ void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) cnt++; trace_iterator_reset(&iter); - trace_android_vh_ftrace_format_check(&ftrace_check); - if (ftrace_check) - iter.iter_flags |= TRACE_FILE_LAT_FMT; + iter.iter_flags |= TRACE_FILE_LAT_FMT; if (trace_find_next_entry_inc(&iter) != NULL) { int ret;