tracing: function graph output for preempt/irqs-off tracers
Subsystems (2)
v5 cover tracing: function graph output for preempt/irqs-off tracers
hi,
ok, saga continues ;)
I'm sending reworked version of the graph output support for preemptirqsoff/preemptoff/irqsoff tracers.
v5:
- function graph events are back in game
- changed function graph tracer interface to be able to pass custom tracer flags
- changed calls to trace_function to trace graph records when the display-graph otion is enabled. As function tracer and graph tracer have different spacing during the record output, this way it looks better, and the info stays.
This could be also done via TRACE_PRINT, then it'd be displayed as comment.. I chose the first way, though it could be easily changed.
v4:
- fixed header to display all the info as for
current irqsoff tracer
- fixed reset of the max_tr buffer during the
display-graph switch
v3:
- the function_graph tracer should have the same output as current version even with events enabled, unless I missed something again ;)
- I gave up the idea of function_graph events, since it was unsuitable for outputing other events as comments "/* */"
- I'm not including the raw function_graph for now
attached patches:
- 1/4 adding ftrace events for graph tracer
- 2/4 graph tracer - adding support for passing flags to ouput functions
- 3/4 graph output support for irqsoff tracer
- 4/4 graph output support for preemptirqsoff/preemptoff tracers
plz let me know what you think
wbr,
jirka
--- kernel/trace/trace.c | 35 +++-- kernel/trace/trace.h | 27 +++- kernel/trace/trace_functions_graph.c | 164 +++++++++++++-------- kernel/trace/trace_irqsoff.c | 267 ++++++++++++++++++++++++++++++++-- 4 files changed, 408 insertions(+), 85 deletions(-)
PATCH v5 1/4 tracing: adding ftrace events for graph tracer
hi,
this patch adds ftrace events for graph tracer, so the graph output could be shared within other tracers.
wbr,
jirka
--- kernel/trace/trace_functions_graph.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-)
kernel/trace/trace_functions_graph.c +27 -1
@@ -39,7 +39,7 @@ struct fgraph_data {#define TRACE_GRAPH_PRINT_OVERHEAD 0x4#define TRACE_GRAPH_PRINT_PROC 0x8#define TRACE_GRAPH_PRINT_DURATION 0x10 -#define TRACE_GRAPH_PRINT_ABS_TIME 0X20 +#define TRACE_GRAPH_PRINT_ABS_TIME 0x20static struct tracer_opt trace_opts[] = {/* Display overruns? (for self-debug purpose) */
@@ -1094,6 +1094,12 @@ print_graph_function(struct trace_iterator *iter)return TRACE_TYPE_HANDLED ; } +static enum print_line_t +print_graph_function_event (struct trace_iterator *iter,int flags) +{ +return print_graph_function (iter); +} +static void print_lat_header (struct seq_file *s) {static const char spaces[] =" " /* 16 spaces */
@@ -1197,6 +1203,16 @@ static void graph_trace_close(struct trace_iterator *iter) } } +static struct trace_event graph_trace_entry_event = { + .type =TRACE_GRAPH_ENT , + .trace = print_graph_function_event, +}; + +static struct trace_event graph_trace_ret_event = { + .type =TRACE_GRAPH_RET , + .trace = print_graph_function_event, +}; +static struct tracer graph_trace__read_mostly = { .name ="function_graph" , .open = graph_trace_open,
@@ -1218,6 +1234,16 @@ static __init int init_graph_trace(void) { max_bytes_for_cpu =snprintf (NULL ,0 ,"%d" , nr_cpu_ids -1 ); +if (!register_ftrace_event (&graph_trace_entry_event)) { +pr_warning ("Warning: could not register graph trace events\n" ); +return 1 ; + } + +if (!register_ftrace_event (&graph_trace_ret_event)) { +pr_warning ("Warning: could not register graph trace events\n" ); +return 1 ; + } +return register_tracer (&graph_trace); }
Signature · 1 line
1.6.6.1
PATCH v5 2/4 tracing: graph tracer - adding support for passing flags to ouput functions
In reply to Jiri Olsahi,
changing function graph tracer's interface functions to be able to use it from another tracer.
The main change is to be able to pass custom tracer flags.
wbr,
jirka
--- kernel/trace/trace.h | 6 +- kernel/trace/trace_functions_graph.c | 123 +++++++++++++++++++--------------- 2 files changed, 73 insertions(+), 56 deletions(-)
kernel/trace/trace.h +4 -2
@@ -487,7 +487,9 @@ extern int trace_clock_id;/* Standard output formatting function used for function return traces */ #ifdef CONFIG_FUNCTION_GRAPH_TRACER -extern enum print_line_t print_graph_function (struct trace_iterator *iter); +extern enum print_line_t +print_graph_function_flags (struct trace_iterator *iter,u32 flags); +extern void print_graph_headers_flags (struct seq_file *s,u32 flags);extern enum print_line_t trace_print_graph_duration (unsigned long long duration,struct trace_seq *s);
@@ -520,7 +522,7 @@ static inline int ftrace_graph_addr(unsigned long addr)#endif /* CONFIG_DYNAMIC_FTRACE */ #else /* CONFIG_FUNCTION_GRAPH_TRACER */ static inline enum print_line_t -print_graph_function (struct trace_iterator *iter) +print_graph_function_flags (struct trace_iterator *iter,u32 flags) {return TRACE_TYPE_UNHANDLED ; }
kernel/trace/trace_functions_graph.c +69 -54
376 lines not on this page · raw message
Signature · 1 line
1.6.6.1
PATCH v5 3/4 tracing: graph output support for irqsoff tracer
In reply to Jiri Olsahi,
when I was using irqsoff tracer, I thought it could be any use to see the disabled IRQs flow output same way as function graph output.
The graph output is enabled by setting new 'display-graph' trace option of irqsoff tracer.
wbr,
jirka
--- kernel/trace/trace.c | 35 +++-- kernel/trace/trace.h | 21 +++ kernel/trace/trace_functions_graph.c | 15 ++- kernel/trace/trace_irqsoff.c | 251 ++++++++++++++++++++++++++++++++-- 4 files changed, 293 insertions(+), 29 deletions(-)
kernel/trace/trace.c +22 -13
@@ -1786,7 +1786,7 @@ static void print_func_help_header(struct seq_file *m) } -static void +void print_trace_header (struct seq_file *m,struct trace_iterator *iter) {unsigned long sym_flags = (trace_flags &TRACE_ITER_SYM_MASK );
@@ -1995,7 +1995,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter)return event ? event->binary (iter,0 ) :TRACE_TYPE_HANDLED ; } -static int trace_empty (struct trace_iterator *iter) +int trace_empty (struct trace_iterator *iter) {int cpu;
@@ -2058,6 +2058,23 @@ static enum print_line_t print_trace_line(struct trace_iterator *iter)return print_trace_fmt (iter); } +void trace_default_header (struct seq_file *m) +{ +struct trace_iterator *iter = m->private; + +if (iter->iter_flags &TRACE_FILE_LAT_FMT ) { +/* print nothing if the buffers are empty */ +if (trace_empty (iter)) +return ; +print_trace_header (m, iter); +if (!(trace_flags &TRACE_ITER_VERBOSE )) +print_lat_help_header (m); + }else { +if (!(trace_flags &TRACE_ITER_VERBOSE )) +print_func_help_header (m); + } +} +static int s_show (struct seq_file *m,void *v) {struct trace_iterator *iter = v;
@@ -2070,17 +2087,9 @@ static int s_show(struct seq_file *m, void *v) }if (iter->trace && iter->trace->print_header) iter->trace->print_header (m); -else if (iter->iter_flags &TRACE_FILE_LAT_FMT ) { -/* print nothing if the buffers are empty */ -if (trace_empty (iter)) -return 0 ; -print_trace_header (m, iter); -if (!(trace_flags &TRACE_ITER_VERBOSE )) -print_lat_help_header (m); - }else { -if (!(trace_flags &TRACE_ITER_VERBOSE )) -print_func_help_header (m); - } +else +trace_default_header (m); + }else if (iter->leftover) {/* * If we filled the seq_file buffer earlier, we
kernel/trace/trace.h +21 -0
@@ -376,6 +376,9 @@ void trace_function(struct trace_array *tr,unsigned long ip, unsigned long parent_ip, unsigned long flags, int pc); +void trace_default_header (struct seq_file *m); +void print_trace_header (struct seq_file *m,struct trace_iterator *iter); +int trace_empty (struct trace_iterator *iter);void trace_graph_return (struct ftrace_graph_ret *trace);int trace_graph_entry (struct ftrace_graph_ent *trace);
@@ -487,11 +490,29 @@ extern int trace_clock_id;/* Standard output formatting function used for function return traces */ #ifdef CONFIG_FUNCTION_GRAPH_TRACER + +/* Flag options */ +#define TRACE_GRAPH_PRINT_OVERRUN 0x1 +#define TRACE_GRAPH_PRINT_CPU 0x2 +#define TRACE_GRAPH_PRINT_OVERHEAD 0x4 +#define TRACE_GRAPH_PRINT_PROC 0x8 +#define TRACE_GRAPH_PRINT_DURATION 0x10 +#define TRACE_GRAPH_PRINT_ABS_TIME 0x20 +extern enum print_line_t print_graph_function_flags (struct trace_iterator *iter,u32 flags);extern void print_graph_headers_flags (struct seq_file *s,u32 flags);extern enum print_line_t trace_print_graph_duration (unsigned long long duration,struct trace_seq *s); +extern void graph_trace_open (struct trace_iterator *iter); +extern void graph_trace_close (struct trace_iterator *iter); +extern int __trace_graph_entry (struct trace_array *tr, +struct ftrace_graph_ent *trace, +unsigned long flags,int pc); +extern void __trace_graph_return (struct trace_array *tr, +struct ftrace_graph_ret *trace, +unsigned long flags,int pc); +#ifdef CONFIG_DYNAMIC_FTRACE /* TODO: make this variable */
kernel/trace/trace_functions_graph.c +10 -5
@@ -178,7 +178,7 @@ unsigned long ftrace_return_to_handler(unsigned long frame_pointer)return ret; } -static int __trace_graph_entry (struct trace_array *tr, +int __trace_graph_entry (struct trace_array *tr,struct ftrace_graph_ent *trace,unsigned long flags,int pc)
@@ -245,7 +245,7 @@ int trace_graph_thresh_entry(struct ftrace_graph_ent *trace)return trace_graph_entry (trace); } -static void __trace_graph_return (struct trace_array *tr, +void __trace_graph_return (struct trace_array *tr,struct ftrace_graph_ret *trace,unsigned long flags,int pc)
@@ -1091,6 +1091,11 @@ print_graph_function_flags(struct trace_iterator *iter, u32 flags)trace_assign_type (field, entry);return print_graph_return (&field->ret, s, entry, iter, flags); } +case TRACE_STACK : +case TRACE_FN : +/* dont trace stack and functions as comments */ +return TRACE_TYPE_UNHANDLED ; +default :return print_graph_comment (s, entry, iter, flags); }
@@ -1168,12 +1173,12 @@ void print_graph_headers_flags(struct seq_file *s, u32 flags)seq_printf (s," | | | |\n" ); } -static void print_graph_headers (struct seq_file *s) +void print_graph_headers (struct seq_file *s) {print_graph_headers_flags (s, tracer_flags.val); } -static void graph_trace_open (struct trace_iterator *iter) +void graph_trace_open (struct trace_iterator *iter) {/* pid and depth on the last trace processed */ struct fgraph_data *data;
@@ -1208,7 +1213,7 @@ static void graph_trace_open(struct trace_iterator *iter)pr_warning ("function graph tracer: not enough memory\n" ); } -static void graph_trace_close (struct trace_iterator *iter) +void graph_trace_close (struct trace_iterator *iter) {struct fgraph_data *data = iter->private;
kernel/trace/trace_irqsoff.c +240 -11
326 lines not on this page · raw message
Signature · 1 line
1.6.6.1
Re: [PATCHv5 3/4] tracing: graph output support for irqsoff tracer
kernel/trace/trace_irqsoff.c void trace_preempt_off(unsigned long a0, unsigned long a1) · line 562
Quoted 13 lines · Jiri Olsa
kernel/trace/trace_irqsoff.c +10
-2+static int start_irqsoff_tracer (struct trace_array *tr,int graph) { -register_ftrace_function (&trace_ops); -if (tracing_is_enabled ()) +int ret =0 ; + +if (!graph) + ret =register_ftrace_function (&trace_ops); +#ifdef CONFIG_FUNCTION_GRAPH_TRACER + else + ret =register_ftrace_graph (&irqsoff_graph_return, + &irqsoff_graph_entry); +#endif
Please rather define static inline stubs for register_ftrace_graph in linux/ftrace.h if !CONFIG_FUNCTION_GRAPH_TRACER
Quoted 11 lines
kernel/trace/trace_irqsoff.c +5
-1+ +if (!ret &&tracing_is_enabled ()) tracer_enabled =1 ;else tracer_enabled =0 ; + +return ret; } -static void stop_irqsoff_tracer (struct trace_array *tr) +static void stop_irqsoff_tracer (struct trace_array *tr,int graph)
kernel/trace/trace_irqsoff.c void trace_preempt_off(unsigned long a0, unsigned long a1) · line 581
Quoted 10 lines
kernel/trace/trace_irqsoff.c +7
-1{ tracer_enabled =0 ; -unregister_ftrace_function (&trace_ops); + +if (!graph) +unregister_ftrace_function (&trace_ops); +#ifdef CONFIG_FUNCTION_GRAPH_TRACER + else +unregister_ftrace_graph (); +#endif
Same here.
Thanks.
PATCH v5 4/4 tracing: graph output support for preemptirqsoff/preemptoff tracers
In reply to Jiri Olsahi,
adding support for graph output for preemptirqsoff/preemptoff tracers.
wbr,
jirka
--- kernel/trace/trace_irqsoff.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
kernel/trace/trace_irqsoff.c +16 -0
@@ -664,9 +664,17 @@ static struct tracer preemptoff_tracer __read_mostly = .start = irqsoff_tracer_start, .stop = irqsoff_tracer_stop, .print_max = 1, + .print_header = irqsoff_print_header, + .print_line = irqsoff_print_line, + .flags = &tracer_flags, + .set_flag = irqsoff_set_flag, #ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_preemptoff, #endif +#ifdef CONFIG_FUNCTION_GRAPH_TRACER + .open = irqsoff_trace_open, + .close = irqsoff_trace_close, +#endif };# define register_preemptoff (trace) register_tracer(&trace)#else
@@ -692,9 +700,17 @@ static struct tracer preemptirqsoff_tracer __read_mostly = .start = irqsoff_tracer_start, .stop = irqsoff_tracer_stop, .print_max = 1, + .print_header = irqsoff_print_header, + .print_line = irqsoff_print_line, + .flags = &tracer_flags, + .set_flag = irqsoff_set_flag, #ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_preemptirqsoff, #endif +#ifdef CONFIG_FUNCTION_GRAPH_TRACER + .open = irqsoff_trace_open, + .close = irqsoff_trace_close, +#endif };# define register_preemptirqsoff (trace) register_tracer(&trace)
Signature · 1 line
1.6.6.1