tracing: function graph output for wakeup tracer
Subsystems (2)
v2 cover tracing: function graph output for wakeup tracer
hi,
adding function graph output to irqsoff tracer. The graph output is enabled by setting new 'display-graph' trace option.
The v2 updates are based on comments by Frederic Weisbecker and Steven Rostedt, also rebased to latest master.
v2:
- librarized common functions from irqs/preemptoff tracers
- using local_save_flags instead disabling irqs to get the flags in wakeup_graph_return/wakeup_graph_entry
attached patches:
- 1/3 proper check for irq_depth routines
- 2/3 librarize graph related irqs/preempts off calls
- 3/3 graph support for wakeup tracer
plz let me know what you think
wbr,
jirka
--- kernel/trace/trace.h | 4 + kernel/trace/trace_functions_graph.c | 87 ++++++++++++- kernel/trace/trace_irqsoff.c | 56 +------- kernel/trace/trace_sched_wakeup.c | 231 ++++++++++++++++++++++++++++++++-- 4 files changed, 312 insertions(+), 66 deletions(-)
PATCH v2 1/3 tracing: proper check for irq_depth routines
The check_irq_entry and check_irq_return could be called from graph event context. In such case there's no graph private data allocated. Adding checks to handle this case.
wbr,
jirka
--- kernel/trace/trace_functions_graph.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-)
kernel/trace/trace_functions_graph.c +20 -4
@@ -887,12 +887,20 @@ check_irq_entry(struct trace_iterator *iter, u32 flags, unsigned long addr, int depth) { int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* We either display irqs, or we got called as +* graph event, and out private data do no exist. +* In both cases we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are inside the irq code */
@@ -925,12 +933,20 @@ static int check_irq_return(struct trace_iterator *iter, u32 flags, int depth) { int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* We either display irqs, or we got called as +* graph event, and out private data do no exist. +* In both cases we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are not inside the irq code. */
Signature · 1 line
1.7.1
Steven Rostedt
maintainerRe: [PATCHv2 1/3] tracing: proper check for irq_depth routines
Quoted 19 lines · Jiri Olsa
The
check_irq_entryandcheck_irq_returncould be called from graph event context. In such case there's no graph private data allocated. Adding checks to handle this case.wbr,
jirkaSigned-off-by Jiri Olsa <[email protected]>--- kernel/trace/trace_functions_graph.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-)kernel/trace/trace_functions_graph.c +0
-0@@ -887,12 +887,20 @@ check_irq_entry(struct trace_iterator *iter, u32 flags, unsigned long addr, int depth)
kernel/trace/trace_functions_graph.c check_irq_entry(struct trace_iterator *iter, u32 flags, · line 895
Quoted 10 lines
kernel/trace/trace_functions_graph.c +4
-2{int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* We either display irqs, or we got called as +* graph event, and out private data do no exist.
"out private data do no exist" makes no sense.
Quoted 13 lines
kernel/trace/trace_functions_graph.c +6
-0+* In both cases we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are inside the irq code */ @@ -925,12 +933,20 @@ static int check_irq_return(struct trace_iterator *iter, u32 flags, int depth)
kernel/trace/trace_functions_graph.c static int · line 941
Quoted 10 lines
kernel/trace/trace_functions_graph.c +4
-2{int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* We either display irqs, or we got called as +* graph event, and out private data do no exist.
ditto.
-- Steve
Quoted 11 lines
kernel/trace/trace_functions_graph.c +6
-0+* In both cases we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are not inside the irq code. */
Re: [PATCHv2 1/3] tracing: proper check for irq_depth routines
Quoted 67 lines · Steven Rostedt
Quoted 19 lines · Jiri Olsa
The
check_irq_entryandcheck_irq_returncould be called from graph event context. In such case there's no graph private data allocated. Adding checks to handle this case.wbr,
jirkaSigned-off-by Jiri Olsa <[email protected]>--- kernel/trace/trace_functions_graph.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-)kernel/trace/trace_functions_graph.c +0
-0@@ -887,12 +887,20 @@ check_irq_entry(struct trace_iterator *iter, u32 flags, unsigned long addr, int depth)kernel/trace/trace_functions_graph.c check_irq_entry(struct trace_iterator *iter, u32 flags, · line 895
Quoted 10 lines
kernel/trace/trace_functions_graph.c +4
-2{int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* We either display irqs, or we got called as +* graph event, and out private data do no exist. "out private data do no exist" makes no sense.
Quoted 13 lines
kernel/trace/trace_functions_graph.c +6
-0+* In both cases we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are inside the irq code */ @@ -925,12 +933,20 @@ static int check_irq_return(struct trace_iterator *iter, u32 flags, int depth)kernel/trace/trace_functions_graph.c static int · line 941
Quoted 10 lines
kernel/trace/trace_functions_graph.c +4
-2{int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* We either display irqs, or we got called as +* graph event, and out private data do no exist. ditto.
-- Steve
Quoted 6 lines
kernel/trace/trace_functions_graph.c +4
-0+* In both cases we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ;
Quoted 7 lines
kernel/trace/trace_functions_graph.c static int · line 952
Quoted 5 lines
kernel/trace/trace_functions_graph.c +2
-0+ depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are not inside the irq code. */
hi,
attaching changed patch
thanks,
jirka
---
The check_irq_entry and check_irq_return could be called from graph event context. In such case there's no graph private data allocated. Adding checks to handle this case.
wbr,
jirka
--- kernel/trace/trace_functions_graph.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-)
kernel/trace/trace_functions_graph.c +20 -4
@@ -887,12 +887,20 @@ check_irq_entry(struct trace_iterator *iter, u32 flags, unsigned long addr, int depth) { int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* We either display irqs, or we got called as +* graph event, and private data do no exist. +* In both cases we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are inside the irq code */
@@ -925,12 +933,20 @@ static int check_irq_return(struct trace_iterator *iter, u32 flags, int depth) { int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* We either display irqs, or we got called as +* graph event, and private data do no exist. +* In both cases we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are not inside the irq code. */
Signature · 1 line
1.7.1
[tip:perf/core] tracing: Add proper check for irq_depth routines
Commit-ID: a9d61173dc1cb63e660ae89e874e51ba4fd2f991 Gitweb: http://git.kernel.org/tip/a9d61173dc1cb63e660ae89e874e51ba4fd2f991 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 24 Sep 2010 17:41:02 +0200 Committer: Steven Rostedt <[email protected]> CommitDate: Mon, 18 Oct 2010 10:53:25 -0400
tracing: Add proper check for irq_depth routines
The check_irq_entry and check_irq_return could be called from graph event context. In such case there's no graph private data allocated. Adding checks to handle this case.
LKML-Reference: <[email protected]>
[ Fixed some grammar in the comments ]
--- kernel/trace/trace_functions_graph.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-)
kernel/trace/trace_functions_graph.c +20 -4
@@ -888,12 +888,20 @@ check_irq_entry(struct trace_iterator *iter, u32 flags, unsigned long addr, int depth) { int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* If we are either displaying irqs, or we got called as +* a graph event and private data does not exist, +* then we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are inside the irq code */
@@ -926,12 +934,20 @@ static int check_irq_return(struct trace_iterator *iter, u32 flags, int depth) { int cpu = iter->cpu; +int *depth_irq;struct fgraph_data *data = iter->private; -int *depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); -if (flags &TRACE_GRAPH_PRINT_IRQS ) +/* +* If we are either displaying irqs, or we got called as +* a graph event and private data does not exist, +* then we bypass the irq check. +*/ +if ((flags &TRACE_GRAPH_PRINT_IRQS ) || + (!data))return 0 ; + depth_irq = &(per_cpu_ptr (data->cpu_data, cpu)->depth_irq); +/* * We are not inside the irq code. */
PATCH v2 2/3 tracing: librarize graph related irqs/preemptsoff calls
In reply to Jiri OlsaMoving trace_graph_function/print_graph_headers_flags functions to the graph tracers to be globaly available.
wbr,
jirka
--- kernel/trace/trace.h | 4 ++ kernel/trace/trace_functions_graph.c | 63 ++++++++++++++++++++++++++++++++-- kernel/trace/trace_irqsoff.c | 56 ++++-------------------------- 3 files changed, 71 insertions(+), 52 deletions(-)
kernel/trace/trace.h +4 -0
@@ -343,6 +343,10 @@ void trace_function(struct trace_array *tr,unsigned long ip, unsigned long parent_ip, unsigned long flags, int pc); +void trace_graph_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);
kernel/trace/trace_functions_graph.c +60 -3
93 lines not on this page · raw message
kernel/trace/trace_irqsoff.c +7 -49
82 lines not on this page · raw message
Signature · 1 line
1.7.1
[tip:perf/core] tracing: Make graph related irqs/preemptsoff functions global
Commit-ID: 0a772620a2e21fb55a02f70fe38d4b5c3a5fbbbf Gitweb: http://git.kernel.org/tip/0a772620a2e21fb55a02f70fe38d4b5c3a5fbbbf Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 23 Sep 2010 14:00:52 +0200 Committer: Steven Rostedt <[email protected]> CommitDate: Mon, 18 Oct 2010 10:53:28 -0400
tracing: Make graph related irqs/preemptsoff functions global
Move trace_graph_function() and print_graph_headers_flags() functions to the trace_function_graph.c to be globaly available.
LKML-Reference: <[email protected]>
--- kernel/trace/trace.h | 4 ++ kernel/trace/trace_functions_graph.c | 63 ++++++++++++++++++++++++++++++++-- kernel/trace/trace_irqsoff.c | 56 ++++-------------------------- 3 files changed, 71 insertions(+), 52 deletions(-)
kernel/trace/trace.h +4 -0
@@ -343,6 +343,10 @@ void trace_function(struct trace_array *tr,unsigned long ip, unsigned long parent_ip, unsigned long flags, int pc); +void trace_graph_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);
kernel/trace/trace_functions_graph.c +60 -3
93 lines not on this page · raw message
kernel/trace/trace_irqsoff.c +7 -49
82 lines not on this page · raw message
PATCH v2 3/3 tracing: graph support for wakeup tracer
In reply to Jiri OlsaAdding function graph output to irqsoff tracer. The graph output is enabled by setting new 'display-graph' trace option.
wbr,
jirka
--- kernel/trace/trace_sched_wakeup.c | 231 +++++++++++++++++++++++++++++++++++-- 1 files changed, 221 insertions(+), 10 deletions(-)
kernel/trace/trace_sched_wakeup.c +221 -10
@@ -31,13 +31,33 @@ static int wakeup_rt;static arch_spinlock_t wakeup_lock = (arch_spinlock_t )__ARCH_SPIN_LOCK_UNLOCKED; +static void wakeup_reset (struct trace_array *tr);static void __wakeup_reset (struct trace_array *tr); +static int wakeup_graph_entry (struct ftrace_graph_ent *trace); +static void wakeup_graph_return (struct ftrace_graph_ret *trace);static int save_lat_flag; +#define TRACE_DISPLAY_GRAPH 1 + +static struct tracer_opt trace_opts[] = { +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +/* display latency trace as call graph */ + {TRACER_OPT (display-graph,TRACE_DISPLAY_GRAPH ) }, +#endif + { }/* Empty entry */ +}; + +static struct tracer_flags tracer_flags = { + .val =0 , + .opts = trace_opts, +}; + +#define is_graph () (tracer_flags.val & TRACE_DISPLAY_GRAPH) +#ifdef CONFIG_FUNCTION_TRACER /* -* irqsoff uses its own tracer function to keep the overhead down: +* wakeup uses its own tracer function to keep the overhead down: */ static void wakeup_tracer_call (unsigned long ip,unsigned long parent_ip)
@@ -80,8 +100,191 @@ static struct ftrace_ops trace_ops __read_mostly = { .func = wakeup_tracer_call, }; + +static int start_func_tracer (int graph) +{ +int ret; + +if (!graph) + ret =register_ftrace_function (&trace_ops); +else + ret =register_ftrace_graph (&wakeup_graph_return, + &wakeup_graph_entry); + +if (!ret &&tracing_is_enabled ()) + tracer_enabled =1 ; +else + tracer_enabled =0 ; + +return ret; +} + +static void stop_func_tracer (int graph) +{ + tracer_enabled =0 ; + +if (!graph) +unregister_ftrace_function (&trace_ops); +else +unregister_ftrace_graph (); +} +#endif /* CONFIG_FUNCTION_TRACER */ +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +static int wakeup_set_flag (u32 old_flags,u32 bit,int set) +{ + +if (!(bit &TRACE_DISPLAY_GRAPH )) +return -EINVAL ; + +if (!(is_graph () ^ set)) +return 0 ; + +stop_func_tracer (!set); + +wakeup_reset (wakeup_trace); + tracing_max_latency =0 ; + +return start_func_tracer (set); +} + +static int wakeup_graph_entry (struct ftrace_graph_ent *trace) +{ +struct trace_array *tr = wakeup_trace; +struct trace_array_cpu *data; +unsigned long flags; +long disabled; +int cpu, pc, ret =0 ; + +if (likely (!wakeup_task)) +return 0 ; + + pc =preempt_count (); +preempt_disable_notrace (); + + cpu =raw_smp_processor_id (); +if (cpu != wakeup_current_cpu) + goto out_enable; + + data = tr->data[cpu]; + disabled =atomic_inc_return (&data->disabled); +if (unlikely (disabled !=1 )) + goto out; + +local_save_flags (flags); + ret =__trace_graph_entry (tr, trace, flags, pc); + +out: +atomic_dec (&data->disabled); + +out_enable: +preempt_enable_notrace (); +return ret; +} + +static void wakeup_graph_return (struct ftrace_graph_ret *trace) +{ +struct trace_array *tr = wakeup_trace; +struct trace_array_cpu *data; +unsigned long flags; +long disabled; +int cpu, pc; + +if (likely (!wakeup_task)) +return ; + + pc =preempt_count (); +preempt_disable_notrace (); + + cpu =raw_smp_processor_id (); +if (cpu != wakeup_current_cpu) + goto out_enable; + + data = tr->data[cpu]; + disabled =atomic_inc_return (&data->disabled); +if (unlikely (disabled !=1 )) + goto out; + +local_save_flags (flags); +__trace_graph_return (tr, trace, flags, pc); + +out: +atomic_dec (&data->disabled); + +out_enable: +preempt_enable_notrace (); +return ; +} + +static void wakeup_trace_open (struct trace_iterator *iter) +{ +if (is_graph ()) +graph_trace_open (iter); +} + +static void wakeup_trace_close (struct trace_iterator *iter) +{ +if (iter->private) +graph_trace_close (iter); +} + +#define GRAPH_TRACER_FLAGS (TRACE_GRAPH_PRINT_PROC) + +static enum print_line_t wakeup_print_line (struct trace_iterator *iter) +{ +/* +* In graph mode call the graph tracer output function, +* otherwise go with the TRACE_FN event handler +*/ +if (is_graph ()) +return print_graph_function_flags (iter,GRAPH_TRACER_FLAGS ); + +return TRACE_TYPE_UNHANDLED ; +} + +static void wakeup_print_header (struct seq_file *s) +{ +if (is_graph ()) +print_graph_headers_flags (s,GRAPH_TRACER_FLAGS ); +else +trace_default_header (s); +} + +static void +__trace_function (struct trace_array *tr, +unsigned long ip,unsigned long parent_ip, +unsigned long flags,int pc) +{ +if (is_graph ()) +trace_graph_function (tr, ip, parent_ip, flags, pc); +else +trace_function (tr, ip, parent_ip, flags, pc); +} +#else +#define __trace_function trace_function + +static int wakeup_set_flag (u32 old_flags,u32 bit,int set) +{ +return -EINVAL ; +} + +static int wakeup_graph_entry (struct ftrace_graph_ent *trace) +{ +return -1 ; +} + +static enum print_line_t wakeup_print_line (struct trace_iterator *iter) +{ +return TRACE_TYPE_UNHANDLED ; +} + +static void wakeup_graph_return (struct ftrace_graph_ret *trace) { } +static void wakeup_print_header (struct seq_file *s) { } +static void wakeup_trace_open (struct trace_iterator *iter) { } +static void wakeup_trace_close (struct trace_iterator *iter) { } +#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ +/* * Should this new latency be reported/recorded? */
@@ -152,7 +355,7 @@ probe_wakeup_sched_switch(void *ignore,/* The task we are waiting for is waking up */ data = wakeup_trace->data[wakeup_cpu]; -trace_function (wakeup_trace,CALLER_ADDR0 ,CALLER_ADDR1 , flags, pc); +__trace_function (wakeup_trace,CALLER_ADDR0 ,CALLER_ADDR1 , flags, pc);tracing_sched_switch_trace (wakeup_trace, prev, next, flags, pc);T0 = data->preempt_timestamp;
@@ -252,7 +455,7 @@ probe_wakeup(void *ignore, struct task_struct *p, int success)* is not called by an assembly function (where as schedule is) * it should be safe to use it here. */ -trace_function (wakeup_trace,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); +__trace_function (wakeup_trace,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); out_locked:arch_spin_unlock (&wakeup_lock);
@@ -303,12 +506,8 @@ static void start_wakeup_tracer(struct trace_array *tr)*/ smp_wmb (); -register_ftrace_function (&trace_ops); - -if (tracing_is_enabled ()) - tracer_enabled =1 ; -else - tracer_enabled =0 ; +if (start_func_tracer (is_graph ())) +printk (KERN_ERR "failed to start wakeup tracer\n" );return ; fail_deprobe_wake_new:
@@ -320,7 +519,7 @@ fail_deprobe:static void stop_wakeup_tracer (struct trace_array *tr) { tracer_enabled =0 ; -unregister_ftrace_function (&trace_ops); +stop_func_tracer (is_graph ());unregister_trace_sched_switch (probe_wakeup_sched_switch,NULL );unregister_trace_sched_wakeup_new (probe_wakeup,NULL );unregister_trace_sched_wakeup (probe_wakeup,NULL );
@@ -379,9 +578,15 @@ static struct tracer wakeup_tracer __read_mostly = .start = wakeup_tracer_start, .stop = wakeup_tracer_stop, .print_max = 1, + .print_header = wakeup_print_header, + .print_line = wakeup_print_line, + .flags = &tracer_flags, + .set_flag = wakeup_set_flag, #ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_wakeup, #endif + .open = wakeup_trace_open, + .close = wakeup_trace_close, .use_max_tr = 1, };
@@ -394,9 +599,15 @@ static struct tracer wakeup_rt_tracer __read_mostly = .stop = wakeup_tracer_stop, .wait_pipe = poll_wait_pipe, .print_max = 1, + .print_header = wakeup_print_header, + .print_line = wakeup_print_line, + .flags = &tracer_flags, + .set_flag = wakeup_set_flag, #ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_wakeup, #endif + .open = wakeup_trace_open, + .close = wakeup_trace_close, .use_max_tr = 1, };
Signature · 1 line
1.7.1
[tip:perf/core] tracing: Graph support for wakeup tracer
Commit-ID: 7495a5beaa22f190f4888aa8cbe4827c16575d0a Gitweb: http://git.kernel.org/tip/7495a5beaa22f190f4888aa8cbe4827c16575d0a Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 23 Sep 2010 14:00:53 +0200 Committer: Steven Rostedt <[email protected]> CommitDate: Mon, 18 Oct 2010 10:53:30 -0400
tracing: Graph support for wakeup tracer
Add function graph support for wakeup latency tracer. The graph output is enabled by setting the 'display-graph' trace option.
LKML-Reference: <[email protected]>
--- kernel/trace/trace_sched_wakeup.c | 231 +++++++++++++++++++++++++++++++++++-- 1 files changed, 221 insertions(+), 10 deletions(-)
kernel/trace/trace_sched_wakeup.c +221 -10
@@ -31,13 +31,33 @@ static int wakeup_rt;static arch_spinlock_t wakeup_lock = (arch_spinlock_t )__ARCH_SPIN_LOCK_UNLOCKED; +static void wakeup_reset (struct trace_array *tr);static void __wakeup_reset (struct trace_array *tr); +static int wakeup_graph_entry (struct ftrace_graph_ent *trace); +static void wakeup_graph_return (struct ftrace_graph_ret *trace);static int save_lat_flag; +#define TRACE_DISPLAY_GRAPH 1 + +static struct tracer_opt trace_opts[] = { +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +/* display latency trace as call graph */ + {TRACER_OPT (display-graph,TRACE_DISPLAY_GRAPH ) }, +#endif + { }/* Empty entry */ +}; + +static struct tracer_flags tracer_flags = { + .val =0 , + .opts = trace_opts, +}; + +#define is_graph () (tracer_flags.val & TRACE_DISPLAY_GRAPH) +#ifdef CONFIG_FUNCTION_TRACER /* -* irqsoff uses its own tracer function to keep the overhead down: +* wakeup uses its own tracer function to keep the overhead down: */ static void wakeup_tracer_call (unsigned long ip,unsigned long parent_ip)
@@ -80,8 +100,191 @@ static struct ftrace_ops trace_ops __read_mostly = { .func = wakeup_tracer_call, }; + +static int start_func_tracer (int graph) +{ +int ret; + +if (!graph) + ret =register_ftrace_function (&trace_ops); +else + ret =register_ftrace_graph (&wakeup_graph_return, + &wakeup_graph_entry); + +if (!ret &&tracing_is_enabled ()) + tracer_enabled =1 ; +else + tracer_enabled =0 ; + +return ret; +} + +static void stop_func_tracer (int graph) +{ + tracer_enabled =0 ; + +if (!graph) +unregister_ftrace_function (&trace_ops); +else +unregister_ftrace_graph (); +} +#endif /* CONFIG_FUNCTION_TRACER */ +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +static int wakeup_set_flag (u32 old_flags,u32 bit,int set) +{ + +if (!(bit &TRACE_DISPLAY_GRAPH )) +return -EINVAL ; + +if (!(is_graph () ^ set)) +return 0 ; + +stop_func_tracer (!set); + +wakeup_reset (wakeup_trace); + tracing_max_latency =0 ; + +return start_func_tracer (set); +} + +static int wakeup_graph_entry (struct ftrace_graph_ent *trace) +{ +struct trace_array *tr = wakeup_trace; +struct trace_array_cpu *data; +unsigned long flags; +long disabled; +int cpu, pc, ret =0 ; + +if (likely (!wakeup_task)) +return 0 ; + + pc =preempt_count (); +preempt_disable_notrace (); + + cpu =raw_smp_processor_id (); +if (cpu != wakeup_current_cpu) + goto out_enable; + + data = tr->data[cpu]; + disabled =atomic_inc_return (&data->disabled); +if (unlikely (disabled !=1 )) + goto out; + +local_save_flags (flags); + ret =__trace_graph_entry (tr, trace, flags, pc); + +out: +atomic_dec (&data->disabled); + +out_enable: +preempt_enable_notrace (); +return ret; +} + +static void wakeup_graph_return (struct ftrace_graph_ret *trace) +{ +struct trace_array *tr = wakeup_trace; +struct trace_array_cpu *data; +unsigned long flags; +long disabled; +int cpu, pc; + +if (likely (!wakeup_task)) +return ; + + pc =preempt_count (); +preempt_disable_notrace (); + + cpu =raw_smp_processor_id (); +if (cpu != wakeup_current_cpu) + goto out_enable; + + data = tr->data[cpu]; + disabled =atomic_inc_return (&data->disabled); +if (unlikely (disabled !=1 )) + goto out; + +local_save_flags (flags); +__trace_graph_return (tr, trace, flags, pc); + +out: +atomic_dec (&data->disabled); + +out_enable: +preempt_enable_notrace (); +return ; +} + +static void wakeup_trace_open (struct trace_iterator *iter) +{ +if (is_graph ()) +graph_trace_open (iter); +} + +static void wakeup_trace_close (struct trace_iterator *iter) +{ +if (iter->private) +graph_trace_close (iter); +} + +#define GRAPH_TRACER_FLAGS (TRACE_GRAPH_PRINT_PROC) + +static enum print_line_t wakeup_print_line (struct trace_iterator *iter) +{ +/* +* In graph mode call the graph tracer output function, +* otherwise go with the TRACE_FN event handler +*/ +if (is_graph ()) +return print_graph_function_flags (iter,GRAPH_TRACER_FLAGS ); + +return TRACE_TYPE_UNHANDLED ; +} + +static void wakeup_print_header (struct seq_file *s) +{ +if (is_graph ()) +print_graph_headers_flags (s,GRAPH_TRACER_FLAGS ); +else +trace_default_header (s); +} + +static void +__trace_function (struct trace_array *tr, +unsigned long ip,unsigned long parent_ip, +unsigned long flags,int pc) +{ +if (is_graph ()) +trace_graph_function (tr, ip, parent_ip, flags, pc); +else +trace_function (tr, ip, parent_ip, flags, pc); +} +#else +#define __trace_function trace_function + +static int wakeup_set_flag (u32 old_flags,u32 bit,int set) +{ +return -EINVAL ; +} + +static int wakeup_graph_entry (struct ftrace_graph_ent *trace) +{ +return -1 ; +} + +static enum print_line_t wakeup_print_line (struct trace_iterator *iter) +{ +return TRACE_TYPE_UNHANDLED ; +} + +static void wakeup_graph_return (struct ftrace_graph_ret *trace) { } +static void wakeup_print_header (struct seq_file *s) { } +static void wakeup_trace_open (struct trace_iterator *iter) { } +static void wakeup_trace_close (struct trace_iterator *iter) { } +#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ +/* * Should this new latency be reported/recorded? */
@@ -152,7 +355,7 @@ probe_wakeup_sched_switch(void *ignore,/* The task we are waiting for is waking up */ data = wakeup_trace->data[wakeup_cpu]; -trace_function (wakeup_trace,CALLER_ADDR0 ,CALLER_ADDR1 , flags, pc); +__trace_function (wakeup_trace,CALLER_ADDR0 ,CALLER_ADDR1 , flags, pc);tracing_sched_switch_trace (wakeup_trace, prev, next, flags, pc);T0 = data->preempt_timestamp;
@@ -252,7 +455,7 @@ probe_wakeup(void *ignore, struct task_struct *p, int success)* is not called by an assembly function (where as schedule is) * it should be safe to use it here. */ -trace_function (wakeup_trace,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); +__trace_function (wakeup_trace,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); out_locked:arch_spin_unlock (&wakeup_lock);
@@ -303,12 +506,8 @@ static void start_wakeup_tracer(struct trace_array *tr)*/ smp_wmb (); -register_ftrace_function (&trace_ops); - -if (tracing_is_enabled ()) - tracer_enabled =1 ; -else - tracer_enabled =0 ; +if (start_func_tracer (is_graph ())) +printk (KERN_ERR "failed to start wakeup tracer\n" );return ; fail_deprobe_wake_new:
@@ -320,7 +519,7 @@ fail_deprobe:static void stop_wakeup_tracer (struct trace_array *tr) { tracer_enabled =0 ; -unregister_ftrace_function (&trace_ops); +stop_func_tracer (is_graph ());unregister_trace_sched_switch (probe_wakeup_sched_switch,NULL );unregister_trace_sched_wakeup_new (probe_wakeup,NULL );unregister_trace_sched_wakeup (probe_wakeup,NULL );
@@ -379,9 +578,15 @@ static struct tracer wakeup_tracer __read_mostly = .start = wakeup_tracer_start, .stop = wakeup_tracer_stop, .print_max = 1, + .print_header = wakeup_print_header, + .print_line = wakeup_print_line, + .flags = &tracer_flags, + .set_flag = wakeup_set_flag, #ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_wakeup, #endif + .open = wakeup_trace_open, + .close = wakeup_trace_close, .use_max_tr = 1, };
@@ -394,9 +599,15 @@ static struct tracer wakeup_rt_tracer __read_mostly = .stop = wakeup_tracer_stop, .wait_pipe = poll_wait_pipe, .print_max = 1, + .print_header = wakeup_print_header, + .print_line = wakeup_print_line, + .flags = &tracer_flags, + .set_flag = wakeup_set_flag, #ifdef CONFIG_FTRACE_SELFTEST .selftest = trace_selftest_startup_wakeup, #endif + .open = wakeup_trace_open, + .close = wakeup_trace_close, .use_max_tr = 1, };