tracing: function graph output for preempt/irqs-off tracers
Subsystems (2)
v4 cover tracing: function graph output for preempt/irqs-off tracers
hi,
I'm sending reworked version of the graph output support for preemptirqsoff/preemptoff/irqsoff tracers.
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/2 graph output support for irqsoff tracer
- 2/2 graph output support for preemptirqsoff/preemptoff tracers
plz let me know what you think
wbr,
jirka
--- kernel/trace/trace.c | 41 +++++-- kernel/trace/trace.h | 13 ++ kernel/trace/trace_functions_graph.c | 15 ++- kernel/trace/trace_irqsoff.c | 210 ++++++++++++++++++++++++++++++++- 4 files changed, 254 insertions(+), 25 deletions(-)
PATCH v4 1/2 tracing: graph output support for irqsoff tracer
hi,
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 | 41 +++++--- kernel/trace/trace.h | 13 +++ kernel/trace/trace_functions_graph.c | 15 ++- kernel/trace/trace_irqsoff.c | 194 ++++++++++++++++++++++++++++++++-- 4 files changed, 238 insertions(+), 25 deletions(-)
kernel/trace/trace.c +28 -13
@@ -697,6 +697,12 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu)__update_max_tr (tr, tsk, cpu); arch_spin_unlock(&ftrace_max_lock); } + +void reset_max_tr (void ) +{ +tracing_reset_online_cpus (&max_tr); +} +#endif /* CONFIG_TRACER_MAX_TRACE */ /**
@@ -1786,7 +1792,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 +2001,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 +2064,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 +2093,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 +13 -0
@@ -378,6 +378,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);
@@ -404,6 +407,7 @@ extern unsigned long tracing_max_latency;void update_max_tr (struct trace_array *tr,struct task_struct *tsk,int cpu);void update_max_tr_single (struct trace_array *tr,struct task_struct *tsk,int cpu); +void reset_max_tr (void );#endif /* CONFIG_TRACER_MAX_TRACE */ #ifdef CONFIG_STACKTRACE
@@ -492,8 +496,17 @@ 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 void print_graph_headers (struct seq_file *s);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)
@@ -1087,6 +1087,11 @@ print_graph_function(struct trace_iterator *iter)trace_assign_type (field, entry);return print_graph_return (&field->ret, s, entry, iter); } +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); }
@@ -1116,7 +1121,7 @@ static void print_lat_header(struct seq_file *s)seq_printf (s,"#%.*s|||| / \n" , size, spaces); } -static void print_graph_headers (struct seq_file *s) +void print_graph_headers (struct seq_file *s) {int lat = trace_flags &TRACE_ITER_LATENCY_FMT ;
@@ -1152,7 +1157,7 @@ static void print_graph_headers(struct seq_file *s)seq_printf (s," | | | |\n" ); } -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;
@@ -1187,7 +1192,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 +187 -7
245 lines not on this page · raw message
Signature · 1 line
1.6.6.1
PATCH v4 2/2 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
@@ -615,9 +615,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
@@ -643,9 +651,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