diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 7d897898eaaf..03be03e0e479 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -36,6 +36,7 @@ #include #include #include +#include /* * Export tracepoints that act as a bare tracehook (ie: have no trace event @@ -97,3 +98,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rproc_recovery_set); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_timer_calc_index); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sched_show_task); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_format_check); diff --git a/include/trace/hooks/ftrace_dump.h b/include/trace/hooks/ftrace_dump.h new file mode 100644 index 000000000000..46570e918a58 --- /dev/null +++ b/include/trace/hooks/ftrace_dump.h @@ -0,0 +1,18 @@ +/* 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 + +DECLARE_HOOK(android_vh_ftrace_format_check, + TP_PROTO(bool *ftrace_check), + TP_ARGS(ftrace_check)); + +#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 3a4d0d990ad2..9ed50f543ecb 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -48,6 +48,7 @@ #include #include #include +#include #include /* COMMAND_LINE_SIZE */ @@ -10246,6 +10247,7 @@ static void ftrace_dump_one(struct trace_array *tr, enum ftrace_dump_mode dump_m unsigned int old_userobj; unsigned long flags; int cnt = 0, cpu; + bool ftrace_check = true; /* * Always turn off tracing when we dump. @@ -10287,6 +10289,14 @@ static void ftrace_dump_one(struct trace_array *tr, enum ftrace_dump_mode dump_m printk("# MAY BE MISSING FUNCTION EVENTS\n"); } + /* + * Ftrace timestmap support two types: + * - ftrace_check = 1, latency format, start with 0 from a specific time. + * - ftrace_check = 0, absolute time format, consistent with kernel time. + * With this vendor hook, we can choose the format from different requirement. + */ + trace_android_vh_ftrace_format_check(&ftrace_check); + /* * We need to stop all tracing on all CPUS to read * the next buffer. This is a bit expensive, but is @@ -10295,14 +10305,14 @@ static void ftrace_dump_one(struct trace_array *tr, enum ftrace_dump_mode dump_m */ while (!trace_empty(&iter)) { - if (!cnt) printk(KERN_TRACE "---------------------------------\n"); cnt++; trace_iterator_reset(&iter); - iter.iter_flags |= TRACE_FILE_LAT_FMT; + if (ftrace_check) + iter.iter_flags |= TRACE_FILE_LAT_FMT; if (trace_find_next_entry_inc(&iter) != NULL) { int ret;