tracing/events: show task comms
Steven Rostedt
maintainerIngo,
This is on top of the changes that I posted yesterday (ftrace-1), but in its own branch.
Please pull the latest tip/tracing/ftrace-2 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/ftrace-2
Zhaolei (2):
ftrace: Add task_comm support for trace_event
ftrace: clean up of using ftrace_event_enable_disable()
----
kernel/trace/trace_events.c | 42 ++++++++++++++++-------------------------- 1 files changed, 16 insertions(+), 26 deletions(-)
Steven Rostedt
maintainerPATCH 1/2 ftrace: Add task_comm support for trace_event
From: Zhaolei <[email protected]>
If we use trace_event alone(without function trace, .etc), it can't output enough task command information.
Before patch:
# echo 1 > debugfs/tracing/events/sched/sched_switch/enable
# cat debugfs/tracing/trace
# tracer: nop
#
# TASK-PID CPU# TIMESTAMP FUNCTION
# | | | | |
<...>-2289 [000] 526276.724790: sched_switch: task bash:2289 [120] ==> sshd:2287 [120]
<...>-2287 [000] 526276.725231: sched_switch: task sshd:2287 [120] ==> bash:2289 [120]
<...>-2289 [000] 526276.725452: sched_switch: task bash:2289 [120] ==> sshd:2287 [120]
<...>-2287 [000] 526276.727181: sched_switch: task sshd:2287 [120] ==> swapper:0 [140]
<idle>-0 [000] 526277.032734: sched_switch: task swapper:0 [140] ==> events/0:5 [115]
<...>-5 [000] 526277.032782: sched_switch: task events/0:5 [115] ==> swapper:0 [140]
...After patch:
# tracer: nop
#
# TASK-PID CPU# TIMESTAMP FUNCTION
# | | | | |
bash-2269 [000] 527347.989229: sched_switch: task bash:2269 [120] ==> sshd:2267 [120]
sshd-2267 [000] 527347.990960: sched_switch: task sshd:2267 [120] ==> bash:2269 [120]
bash-2269 [000] 527347.991143: sched_switch: task bash:2269 [120] ==> sshd:2267 [120]
sshd-2267 [000] 527347.992959: sched_switch: task sshd:2267 [120] ==> swapper:0 [140]
<idle>-0 [000] 527348.531989: sched_switch: task swapper:0 [140] ==> events/0:5 [115]
events/0-5 [000] 527348.532115: sched_switch: task events/0:5 [115] ==> swapper:0 [140]...
LKML-Reference: <[email protected]>
--- kernel/trace/trace_events.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)
kernel/trace/trace_events.c +6 -0
@@ -85,6 +85,7 @@ static void ftrace_clear_events(void)if (call->enabled) { call->enabled =0 ; +tracing_stop_cmdline_record (); call->unregfunc (); } }
@@ -99,12 +100,14 @@ static void ftrace_event_enable_disable(struct ftrace_event_call *call,case 0 :if (call->enabled) { call->enabled =0 ; +tracing_stop_cmdline_record (); call->unregfunc (); }break ;case 1 :if (!call->enabled) { call->enabled =1 ; +tracing_start_cmdline_record (); call->regfunc (); }break ;
@@ -1058,6 +1061,7 @@ static void trace_module_remove_events(struct module *mod) found = true;if (call->enabled) { call->enabled =0 ; +tracing_stop_cmdline_record (); call->unregfunc (); }if (call->event)
@@ -1262,11 +1266,13 @@ static __init void event_trace_self_tests(void) } call->enabled =1 ; +tracing_start_cmdline_record (); call->regfunc ();event_test_stuff (); call->unregfunc (); +tracing_stop_cmdline_record (); call->enabled =0 ;pr_cont ("OK\n" );
Signature · 3 lines
1.6.2.4 --
Re: [PATCH 1/2] ftrace: Add task_comm support for trace_event
Quoted 4 lines · Steven Rostedt
From: Zhaolei <[email protected]>
If we use
trace_eventalone(without function trace, .etc), it can't output enough task command information.
For some reason I still only see the process name sometimes but not always. It is more likely to appear for later entries than earlier ones (and no, this is not an IRQ context problem as this is with my work in progress XFS trace events, and XFS runs no major piece of code in IRQ context)
Steven Rostedt
maintainerPATCH 2/2 ftrace: clean up of using ftrace_event_enable_disable()
In reply to Steven RostedtFrom: Zhaolei <[email protected]>
Always use tracing_stop_cmdline_record() to enable/disable a event.
Impact: cleanup, no functionality changed
LKML-Reference: <[email protected]>
--- kernel/trace/trace_events.c | 44 +++++++++++++----------------------------- 1 files changed, 14 insertions(+), 30 deletions(-)
kernel/trace/trace_events.c +14 -30
@@ -76,26 +76,9 @@ static void trace_destroy_fields(struct ftrace_event_call *call)#endif /* CONFIG_MODULES */ -static void ftrace_clear_events (void ) -{ -struct ftrace_event_call *call; - -mutex_lock (&event_mutex); -list_for_each_entry (call, &ftrace_events, list) { - -if (call->enabled) { - call->enabled =0 ; -tracing_stop_cmdline_record (); - call->unregfunc (); - } - } -mutex_unlock (&event_mutex); -} -static void ftrace_event_enable_disable (struct ftrace_event_call *call,int enable) { -switch (enable) {case 0 :if (call->enabled) {
@@ -114,6 +97,17 @@ static void ftrace_event_enable_disable(struct ftrace_event_call *call, } } +static void ftrace_clear_events (void ) +{ +struct ftrace_event_call *call; + +mutex_lock (&event_mutex); +list_for_each_entry (call, &ftrace_events, list) { +ftrace_event_enable_disable (call,0 ); + } +mutex_unlock (&event_mutex); +} +/* * __ftrace_set_clr_event(NULL, NULL, NULL, set) will set/unset all events. */
@@ -1059,11 +1053,7 @@ static void trace_module_remove_events(struct module *mod)list_for_each_entry_safe (call, p, &ftrace_events, list) {if (call->mod == mod) { found = true; -if (call->enabled) { - call->enabled =0 ; -tracing_stop_cmdline_record (); - call->unregfunc (); - } +ftrace_event_enable_disable (call,0 );if (call->event)unregister_ftrace_event (call->event);debugfs_remove_recursive (call->dir);
@@ -1265,15 +1255,9 @@ static __init void event_trace_self_tests(void)continue ; } - call->enabled =1 ; -tracing_start_cmdline_record (); - call->regfunc (); - +ftrace_event_enable_disable (call,1 );event_test_stuff (); - - call->unregfunc (); -tracing_stop_cmdline_record (); - call->enabled =0 ; +ftrace_event_enable_disable (call,0 );pr_cont ("OK\n" ); }
Signature · 3 lines
1.6.2.4 --
Quoted 11 lines · Steven Rostedt
Ingo,
This is on top of the changes that I posted yesterday (ftrace-1), but in its own branch.
Please pull the latest tip/tracing/ftrace-2 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/ftrace-2
Quoted 7 lines
Zhaolei (2):
ftrace: Addtask_commsupport fortrace_event
ftrace: clean up of usingftrace_event_enable_disable()----
kernel/trace/trace_events.c | 42 ++++++++++++++++-------------------------- 1 files changed, 16 insertions(+), 26 deletions(-)
Pulled, thanks Steve!
Ingo