tracing/ftrace: better manage the context info for events
PATCH 1/1 tracing/ftrace: better manage the context info for events
Impact: make trace_event more convenient for tracers
All tracers (for the moment) that use the struct trace_event want to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.
But some other tracers that want to implement their trace_event callbacks will not necessary need these information or they may want to format them as they want.
This patch adds a new default-enabled trace option: TRACE_ITER_CONTEXT_INFO When disabled through:
echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the sched_switch tracer with context-info (default):
bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle>
<idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0
<idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0
events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0
0:140:R ==> [000] 11:115:R events/0
11:115:S ==> [000] 0:140:R <idle>A tracer can disable it at runtime by clearing the bit TRACE_ITER_CONTEXT_INFO in trace_flags.
Moreover, two callbacks have been added inside trace_event:
_ context_info() which let a tracer override the format of the context info _ lat_context_info() which do the same with the latency_trace file
If they are not defined, the usual way of printing the context info will be used.
--- kernel/trace/trace.c | 155 ++++++++++++------------------------------- kernel/trace/trace.h | 7 ++- kernel/trace/trace_output.c | 120 +++++++++++++++++++++++++++++++++ kernel/trace/trace_output.h | 15 ++++- 4 files changed, 181 insertions(+), 116 deletions(-)
kernel/trace/trace.c +42 -113
@@ -227,7 +227,7 @@ static DECLARE_WAIT_QUEUE_HEAD(trace_wait);/* trace_flags holds trace_options default values */ unsigned long trace_flags =TRACE_ITER_PRINT_PARENT |TRACE_ITER_PRINTK | -TRACE_ITER_ANNOTATE ; +TRACE_ITER_ANNOTATE |TRACE_ITER_CONTEXT_INFO ;/** * trace_wake_up - wake up tasks waiting for trace input
@@ -285,6 +285,7 @@ static const char *trace_options[] = {"userstacktrace" ,"sym-userobj" ,"printk-msg-only" , +"context-info" , NULL };
@@ -1171,7 +1172,7 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu, u64 *ent_ts) }/* Find the next real entry, without updating the iterator itself */ -static struct trace_entry * +struct trace_entry *find_next_entry (struct trace_iterator *iter,int *ent_cpu,u64 *ent_ts) {return __find_next_entry (iter, ent_cpu, ent_ts);
@@ -1351,57 +1352,6 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)seq_puts (m,"\n" ); } -static void -lat_print_generic (struct trace_seq *s,struct trace_entry *entry,int cpu) -{ -int hardirq, softirq; -char *comm; - - comm =trace_find_cmdline (entry->pid); - -trace_seq_printf (s,"%8.8s-%-5d " , comm, entry->pid); -trace_seq_printf (s,"%3d" , cpu); -trace_seq_printf (s,"%c%c" , - (entry->flags &TRACE_FLAG_IRQS_OFF ) ?'d' : - (entry->flags &TRACE_FLAG_IRQS_NOSUPPORT ) ?'X' :'.' , - ((entry->flags &TRACE_FLAG_NEED_RESCHED ) ?'N' :'.' )); - - hardirq = entry->flags &TRACE_FLAG_HARDIRQ ; - softirq = entry->flags &TRACE_FLAG_SOFTIRQ ; -if (hardirq && softirq) { -trace_seq_putc (s,'H' ); - }else { -if (hardirq) { -trace_seq_putc (s,'h' ); - }else { -if (softirq) -trace_seq_putc (s,'s' ); -else -trace_seq_putc (s,'.' ); - } - } - -if (entry->preempt_count) -trace_seq_printf (s,"%x" , entry->preempt_count); -else -trace_seq_puts (s,"." ); -} - -unsigned long preempt_mark_thresh =100 ; - -static void -lat_print_timestamp (struct trace_seq *s,u64 abs_usecs, -unsigned long rel_usecs) -{ -trace_seq_printf (s," %4lldus" , abs_usecs); -if (rel_usecs > preempt_mark_thresh) -trace_seq_puts (s,"!: " ); -else if (rel_usecs >1 ) -trace_seq_puts (s,"+: " ); -else -trace_seq_puts (s," : " ); -} -static void test_cpu_buff_start (struct trace_iterator *iter) {struct trace_seq *s = &iter->seq;
@@ -1419,46 +1369,29 @@ static void test_cpu_buff_start(struct trace_iterator *iter)trace_seq_printf (s,"##### CPU %u buffer started ####\n" , iter->cpu); } -static enum print_line_t -print_lat_fmt (struct trace_iterator *iter,unsigned int trace_idx,int cpu) +static enum print_line_t print_lat_fmt (struct trace_iterator *iter) {struct trace_seq *s = &iter->seq;unsigned long sym_flags = (trace_flags &TRACE_ITER_SYM_MASK ); -struct trace_entry *next_entry;struct trace_event *event; -unsigned long verbose = (trace_flags &TRACE_ITER_VERBOSE );struct trace_entry *entry = iter->ent; -unsigned long abs_usecs; -unsigned long rel_usecs; -u64 next_ts; -char *comm;int ret;test_cpu_buff_start (iter); - next_entry =find_next_entry (iter,NULL , &next_ts); -if (!next_entry) - next_ts = iter->ts; - rel_usecs =ns2usecs (next_ts - iter->ts); - abs_usecs =ns2usecs (iter->ts - iter->tr->time_start); - -if (verbose) { - comm =trace_find_cmdline (entry->pid); -trace_seq_printf (s,"%16s %5d %3d %d %08x %08x [%08lx]" -" %ld.%03ldms (+%ld.%03ldms): " , - comm, - entry->pid, cpu, entry->flags, - entry->preempt_count, trace_idx, -ns2usecs (iter->ts), - abs_usecs/1000 , - abs_usecs %1000 , rel_usecs/1000 , - rel_usecs %1000 ); - }else { -lat_print_generic (s, entry, cpu); -lat_print_timestamp (s, abs_usecs, rel_usecs); + event =ftrace_find_event (entry->type); + +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +if (event) + ret = event->lat_context_info (s, entry, iter, + sym_flags); +else + ret =default_lat_context_info (s, entry, iter, + sym_flags); +if (ret) +return ret; } - event =ftrace_find_event (entry->type);if (event && event->latency_trace) { ret = event->latency_trace (s, entry, sym_flags);if (ret)
@@ -1476,33 +1409,23 @@ static enum print_line_t print_trace_fmt(struct trace_iterator *iter)unsigned long sym_flags = (trace_flags &TRACE_ITER_SYM_MASK );struct trace_entry *entry;struct trace_event *event; -unsigned long usec_rem; -unsigned long long t; -unsigned long secs; -char *comm;int ret; entry = iter->ent;test_cpu_buff_start (iter); - comm =trace_find_cmdline (iter->ent->pid); - - t =ns2usecs (iter->ts); - usec_rem =do_div (t,1000000ULL ); - secs = (unsigned long )t; + event =ftrace_find_event (entry->type); - ret =trace_seq_printf (s,"%16s-%-5d " , comm, entry->pid); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; - ret =trace_seq_printf (s,"[%03d] " , iter->cpu); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; - ret =trace_seq_printf (s,"%5lu.%06lu: " , secs, usec_rem); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +if (event) + ret = event->context_info (s, entry, iter, sym_flags); +else + ret =default_context_info (s, entry, iter, sym_flags); +if (ret) +return ret; + } - event =ftrace_find_event (entry->type);if (event && event->trace) { ret = event->trace (s, entry, sym_flags);if (ret)
@@ -1525,10 +1448,12 @@ static enum print_line_t print_raw_fmt(struct trace_iterator *iter) entry = iter->ent; - ret =trace_seq_printf (s,"%d %d %llu " , - entry->pid, iter->cpu, iter->ts); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { + ret =trace_seq_printf (s,"%d %d %llu " , + entry->pid, iter->cpu, iter->ts); +if (!ret) +return TRACE_TYPE_PARTIAL_LINE ; + } event =ftrace_find_event (entry->type);if (event && event->raw) {
@@ -1553,9 +1478,11 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter) entry = iter->ent; -SEQ_PUT_HEX_FIELD_RET (s, entry->pid); -SEQ_PUT_HEX_FIELD_RET (s, iter->cpu); -SEQ_PUT_HEX_FIELD_RET (s, iter->ts); +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +SEQ_PUT_HEX_FIELD_RET (s, entry->pid); +SEQ_PUT_HEX_FIELD_RET (s, iter->cpu); +SEQ_PUT_HEX_FIELD_RET (s, iter->ts); + } event =ftrace_find_event (entry->type);if (event && event->hex)
@@ -1575,7 +1502,7 @@ static enum print_line_t print_printk_msg_only(struct trace_iterator *iter)trace_assign_type (field, entry); - ret =trace_seq_printf (s, field->buf); + ret =trace_seq_printf (s,"%s" , field->buf);if (!ret)return TRACE_TYPE_PARTIAL_LINE ;
@@ -1590,9 +1517,11 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) entry = iter->ent; -SEQ_PUT_FIELD_RET (s, entry->pid); -SEQ_PUT_FIELD_RET (s, entry->cpu); -SEQ_PUT_FIELD_RET (s, iter->ts); +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +SEQ_PUT_FIELD_RET (s, entry->pid); +SEQ_PUT_FIELD_RET (s, entry->cpu); +SEQ_PUT_FIELD_RET (s, iter->ts); + } event =ftrace_find_event (entry->type);if (event && event->binary)
@@ -1643,7 +1572,7 @@ static enum print_line_t print_trace_line(struct trace_iterator *iter)return print_raw_fmt (iter);if (iter->iter_flags &TRACE_FILE_LAT_FMT ) -return print_lat_fmt (iter, iter->idx, iter->cpu); +return print_lat_fmt (iter);return print_trace_fmt (iter); }
kernel/trace/trace.h +6 -1
@@ -405,6 +405,10 @@ void init_tracer_sysprof_debugfs(struct dentry *d_tracer);struct trace_entry *tracing_get_trace_entry (struct trace_array *tr,struct trace_array_cpu *data); + +struct trace_entry * +find_next_entry (struct trace_iterator *iter,int *ent_cpu,u64 *ent_ts); +void tracing_generic_entry_update (struct trace_entry *entry,unsigned long flags,int pc);
@@ -591,7 +595,8 @@ enum trace_iterator_flags {TRACE_ITER_ANNOTATE =0x2000 ,TRACE_ITER_USERSTACKTRACE =0x4000 ,TRACE_ITER_SYM_USEROBJ =0x8000 , - TRACE_ITER_PRINTK_MSGONLY = 0x10000 +TRACE_ITER_PRINTK_MSGONLY =0x10000 , + TRACE_ITER_CONTEXT_INFO = 0x20000 /* Print pid/cpu/time */ };/*
kernel/trace/trace_output.c +120 -0
132 lines not on this page · raw message
kernel/trace/trace_output.h +13 -2
@@ -6,14 +6,20 @@typedef int (*trace_print_func )(struct trace_seq *s,struct trace_entry *entry,int flags); +typedef int (*context_info_func )(struct trace_seq *s, +struct trace_entry *entry, +struct trace_iterator *iter,int flags); +struct trace_event {struct hlist_node node;int type; -trace_print_func trace; -trace_print_func latency_trace; +trace_print_func trace;/* Usual output on trace or trace_pipe */ +trace_print_func latency_trace;/* Through latency_trace file */ trace_print_func raw;trace_print_func hex;trace_print_func binary; +context_info_func context_info;/* pid/cpu/time on line start */ +context_info_func lat_context_info;/* same in latency_trace */ };extern int trace_seq_printf (struct trace_seq *s,const char *fmt, ...)
@@ -33,6 +39,11 @@ int seq_print_userip_objs(const struct userstack_entry *entry,int seq_print_user_ip (struct trace_seq *s,struct mm_struct *mm,unsigned long ip,unsigned long sym_flags); +int default_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags); +int default_lat_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags); +struct trace_event *ftrace_find_event (int type);int register_ftrace_event (struct trace_event *event);int unregister_ftrace_event (struct trace_event *event);
Signature · 1 line
1.6.1
Quoted 29 lines · Frederic Weisbecker
Impact: make
trace_eventmore convenient for tracersAll tracers (for the moment) that use the struct
trace_eventwant to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.But some other tracers that want to implement their
trace_eventcallbacks will not necessary need these information or they may want to format them as they want.This patch adds a new default-enabled trace option:
TRACE_ITER_CONTEXT_INFOWhen disabled through:echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the
sched_switchtracer with context-info (default):bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle> <idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0 <idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0 events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0 0:140:R ==> [000] 11:115:R events/0 11:115:S ==> [000] 0:140:R <idle>
Quoted 7 lines
A tracer can disable it at runtime by clearing the bit
TRACE_ITER_CONTEXT_INFOintrace_flags.Moreover, two callbacks have been added inside
trace_event:
_context_info()which let a tracer override the format of the context info _lat_context_info()which do the same with thelatency_tracefileIf they are not defined, the usual way of printing the context info will be used.
Quoted 468 lines
--- kernel/trace/trace.c | 155 ++++++++++++------------------------------- kernel/trace/trace.h | 7 ++- kernel/trace/trace_output.c | 120 +++++++++++++++++++++++++++++++++ kernel/trace/trace_output.h | 15 ++++- 4 files changed, 181 insertions(+), 116 deletions(-)kernel/trace/trace.c +42
-113@@ -227,7 +227,7 @@ static DECLARE_WAIT_QUEUE_HEAD(trace_wait);/* trace_flags holds trace_options default values */ unsigned long trace_flags =TRACE_ITER_PRINT_PARENT |TRACE_ITER_PRINTK | -TRACE_ITER_ANNOTATE ; +TRACE_ITER_ANNOTATE |TRACE_ITER_CONTEXT_INFO ;/** * trace_wake_up - wake up tasks waiting for trace input @@ -285,6 +285,7 @@ static const char *trace_options[] = {"userstacktrace" ,"sym-userobj" ,"printk-msg-only" , +"context-info" , NULL };@@ -1171,7 +1172,7 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu, u64 *ent_ts) }/* Find the next real entry, without updating the iterator itself */ -static struct trace_entry * +struct trace_entry *find_next_entry (struct trace_iterator *iter,int *ent_cpu,u64 *ent_ts) {return __find_next_entry (iter, ent_cpu, ent_ts);@@ -1351,57 +1352,6 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)seq_puts (m,"\n" ); } -static void -lat_print_generic (struct trace_seq *s,struct trace_entry *entry,int cpu) -{ -int hardirq, softirq; -char *comm; - - comm =trace_find_cmdline (entry->pid); - -trace_seq_printf (s,"%8.8s-%-5d " , comm, entry->pid); -trace_seq_printf (s,"%3d" , cpu); -trace_seq_printf (s,"%c%c" , - (entry->flags &TRACE_FLAG_IRQS_OFF ) ?'d' : - (entry->flags &TRACE_FLAG_IRQS_NOSUPPORT ) ?'X' :'.' , - ((entry->flags &TRACE_FLAG_NEED_RESCHED ) ?'N' :'.' )); - - hardirq = entry->flags &TRACE_FLAG_HARDIRQ ; - softirq = entry->flags &TRACE_FLAG_SOFTIRQ ; -if (hardirq && softirq) { -trace_seq_putc (s,'H' ); - }else { -if (hardirq) { -trace_seq_putc (s,'h' ); - }else { -if (softirq) -trace_seq_putc (s,'s' ); -else -trace_seq_putc (s,'.' ); - } - } - -if (entry->preempt_count) -trace_seq_printf (s,"%x" , entry->preempt_count); -else -trace_seq_puts (s,"." ); -} - -unsigned long preempt_mark_thresh =100 ; - -static void -lat_print_timestamp (struct trace_seq *s,u64 abs_usecs, -unsigned long rel_usecs) -{ -trace_seq_printf (s," %4lldus" , abs_usecs); -if (rel_usecs > preempt_mark_thresh) -trace_seq_puts (s,"!: " ); -else if (rel_usecs >1 ) -trace_seq_puts (s,"+: " ); -else -trace_seq_puts (s," : " ); -} -static void test_cpu_buff_start (struct trace_iterator *iter) {struct trace_seq *s = &iter->seq;@@ -1419,46 +1369,29 @@ static void test_cpu_buff_start(struct trace_iterator *iter)trace_seq_printf (s,"##### CPU %u buffer started ####\n" , iter->cpu); } -static enum print_line_t -print_lat_fmt (struct trace_iterator *iter,unsigned int trace_idx,int cpu) +static enum print_line_t print_lat_fmt (struct trace_iterator *iter) {struct trace_seq *s = &iter->seq;unsigned long sym_flags = (trace_flags &TRACE_ITER_SYM_MASK ); -struct trace_entry *next_entry;struct trace_event *event; -unsigned long verbose = (trace_flags &TRACE_ITER_VERBOSE );struct trace_entry *entry = iter->ent; -unsigned long abs_usecs; -unsigned long rel_usecs; -u64 next_ts; -char *comm;int ret;test_cpu_buff_start (iter); - next_entry =find_next_entry (iter,NULL , &next_ts); -if (!next_entry) - next_ts = iter->ts; - rel_usecs =ns2usecs (next_ts - iter->ts); - abs_usecs =ns2usecs (iter->ts - iter->tr->time_start); - -if (verbose) { - comm =trace_find_cmdline (entry->pid); -trace_seq_printf (s,"%16s %5d %3d %d %08x %08x [%08lx]" -" %ld.%03ldms (+%ld.%03ldms): " , - comm, - entry->pid, cpu, entry->flags, - entry->preempt_count, trace_idx, -ns2usecs (iter->ts), - abs_usecs/1000 , - abs_usecs %1000 , rel_usecs/1000 , - rel_usecs %1000 ); - }else { -lat_print_generic (s, entry, cpu); -lat_print_timestamp (s, abs_usecs, rel_usecs); + event =ftrace_find_event (entry->type); + +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +if (event) + ret = event->lat_context_info (s, entry, iter, + sym_flags); +else + ret =default_lat_context_info (s, entry, iter, + sym_flags); +if (ret) +return ret; } - event =ftrace_find_event (entry->type);if (event && event->latency_trace) { ret = event->latency_trace (s, entry, sym_flags);if (ret)@@ -1476,33 +1409,23 @@ static enum print_line_t print_trace_fmt(struct trace_iterator *iter)unsigned long sym_flags = (trace_flags &TRACE_ITER_SYM_MASK );struct trace_entry *entry;struct trace_event *event; -unsigned long usec_rem; -unsigned long long t; -unsigned long secs; -char *comm;int ret; entry = iter->ent;test_cpu_buff_start (iter); - comm =trace_find_cmdline (iter->ent->pid); - - t =ns2usecs (iter->ts); - usec_rem =do_div (t,1000000ULL ); - secs = (unsigned long )t; + event =ftrace_find_event (entry->type); - ret =trace_seq_printf (s,"%16s-%-5d " , comm, entry->pid); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; - ret =trace_seq_printf (s,"[%03d] " , iter->cpu); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; - ret =trace_seq_printf (s,"%5lu.%06lu: " , secs, usec_rem); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +if (event) + ret = event->context_info (s, entry, iter, sym_flags); +else + ret =default_context_info (s, entry, iter, sym_flags); +if (ret) +return ret; + } - event =ftrace_find_event (entry->type);if (event && event->trace) { ret = event->trace (s, entry, sym_flags);if (ret)@@ -1525,10 +1448,12 @@ static enum print_line_t print_raw_fmt(struct trace_iterator *iter) entry = iter->ent; - ret =trace_seq_printf (s,"%d %d %llu " , - entry->pid, iter->cpu, iter->ts); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { + ret =trace_seq_printf (s,"%d %d %llu " , + entry->pid, iter->cpu, iter->ts); +if (!ret) +return TRACE_TYPE_PARTIAL_LINE ; + } event =ftrace_find_event (entry->type);if (event && event->raw) {@@ -1553,9 +1478,11 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter) entry = iter->ent; -SEQ_PUT_HEX_FIELD_RET (s, entry->pid); -SEQ_PUT_HEX_FIELD_RET (s, iter->cpu); -SEQ_PUT_HEX_FIELD_RET (s, iter->ts); +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +SEQ_PUT_HEX_FIELD_RET (s, entry->pid); +SEQ_PUT_HEX_FIELD_RET (s, iter->cpu); +SEQ_PUT_HEX_FIELD_RET (s, iter->ts); + } event =ftrace_find_event (entry->type);if (event && event->hex)@@ -1575,7 +1502,7 @@ static enum print_line_t print_printk_msg_only(struct trace_iterator *iter)trace_assign_type (field, entry); - ret =trace_seq_printf (s, field->buf); + ret =trace_seq_printf (s,"%s" , field->buf);if (!ret)return TRACE_TYPE_PARTIAL_LINE ;@@ -1590,9 +1517,11 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) entry = iter->ent; -SEQ_PUT_FIELD_RET (s, entry->pid); -SEQ_PUT_FIELD_RET (s, entry->cpu); -SEQ_PUT_FIELD_RET (s, iter->ts); +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +SEQ_PUT_FIELD_RET (s, entry->pid); +SEQ_PUT_FIELD_RET (s, entry->cpu); +SEQ_PUT_FIELD_RET (s, iter->ts); + } event =ftrace_find_event (entry->type);if (event && event->binary)@@ -1643,7 +1572,7 @@ static enum print_line_t print_trace_line(struct trace_iterator *iter)return print_raw_fmt (iter);if (iter->iter_flags &TRACE_FILE_LAT_FMT ) -return print_lat_fmt (iter, iter->idx, iter->cpu); +return print_lat_fmt (iter);return print_trace_fmt (iter); }kernel/trace/trace.h +6
-1@@ -405,6 +405,10 @@ void init_tracer_sysprof_debugfs(struct dentry *d_tracer);struct trace_entry *tracing_get_trace_entry (struct trace_array *tr,struct trace_array_cpu *data); + +struct trace_entry * +find_next_entry (struct trace_iterator *iter,int *ent_cpu,u64 *ent_ts); +void tracing_generic_entry_update (struct trace_entry *entry,unsigned long flags,int pc);@@ -591,7 +595,8 @@ enum trace_iterator_flags {TRACE_ITER_ANNOTATE =0x2000 ,TRACE_ITER_USERSTACKTRACE =0x4000 ,TRACE_ITER_SYM_USEROBJ =0x8000 , - TRACE_ITER_PRINTK_MSGONLY = 0x10000 +TRACE_ITER_PRINTK_MSGONLY =0x10000 , + TRACE_ITER_CONTEXT_INFO = 0x20000 /* Print pid/cpu/time */ };/* kernel/trace/trace_output.c +120
-0@@ -286,6 +286,120 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)return ret; } +static void +lat_print_generic (struct trace_seq *s,struct trace_entry *entry,int cpu) +{ +int hardirq, softirq; +char *comm; + + comm =trace_find_cmdline (entry->pid); + +trace_seq_printf (s,"%8.8s-%-5d " , comm, entry->pid); +trace_seq_printf (s,"%3d" , cpu); +trace_seq_printf (s,"%c%c" , + (entry->flags &TRACE_FLAG_IRQS_OFF ) ?'d' : + (entry->flags &TRACE_FLAG_IRQS_NOSUPPORT ) ?'X' :'.' , + ((entry->flags &TRACE_FLAG_NEED_RESCHED ) ?'N' :'.' )); + + hardirq = entry->flags &TRACE_FLAG_HARDIRQ ; + softirq = entry->flags &TRACE_FLAG_SOFTIRQ ; +if (hardirq && softirq) { +trace_seq_putc (s,'H' ); + }else { +if (hardirq) { +trace_seq_putc (s,'h' ); + }else { +if (softirq) +trace_seq_putc (s,'s' ); +else +trace_seq_putc (s,'.' ); + } + } + +if (entry->preempt_count) +trace_seq_printf (s,"%x" , entry->preempt_count); +else +trace_seq_puts (s,"." ); +} + +static unsigned long preempt_mark_thresh =100 ; + +static void +lat_print_timestamp (struct trace_seq *s,u64 abs_usecs, +unsigned long rel_usecs) +{ +trace_seq_printf (s," %4lldus" , abs_usecs); +if (rel_usecs > preempt_mark_thresh) +trace_seq_puts (s,"!: " ); +else if (rel_usecs >1 ) +trace_seq_puts (s,"+: " ); +else +trace_seq_puts (s," : " ); +} + +int default_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags) +{ +unsigned long usec_rem; +unsigned long long t; +unsigned long secs; +char *comm; + + comm =trace_find_cmdline (entry->pid); + + t =ns2usecs (iter->ts); + usec_rem =do_div (t,USEC_PER_SEC ); + secs = (unsigned long )t; + +if (!trace_seq_printf (s,"%16s-%-5d " , comm, entry->pid)) + goto partial; +if (!trace_seq_printf (s,"[%03d] " , entry->cpu)) + goto partial; +if (!trace_seq_printf (s,"%5lu.%06lu: " , secs, usec_rem)) + goto partial; + +return 0 ; + +partial: +return TRACE_TYPE_PARTIAL_LINE ; +} + +int default_lat_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags) +{ +struct trace_entry *next_entry; +unsigned long verbose = (trace_flags &TRACE_ITER_VERBOSE ); +unsigned long abs_usecs; +unsigned long rel_usecs; +u64 next_ts; +char *comm; + + next_entry =find_next_entry (iter,NULL , &next_ts); +if (!next_entry) + next_ts = iter->ts; + rel_usecs =ns2usecs (next_ts - iter->ts); + abs_usecs =ns2usecs (iter->ts - iter->tr->time_start); + +if (verbose) { + comm =trace_find_cmdline (entry->pid); +trace_seq_printf (s,"%16s %5d %3d %d %08x %08lx [%08lx]" +" %ld.%03ldms (+%ld.%03ldms): " , + comm, + entry->pid, entry->cpu, entry->flags, + entry->preempt_count, iter->idx, +ns2usecs (iter->ts), + abs_usecs/1000 , + abs_usecs %1000 , rel_usecs/1000 , + rel_usecs %1000 ); + }else { +lat_print_generic (s, entry, entry->cpu); +lat_print_timestamp (s, abs_usecs, rel_usecs); + } + +return 0 ; +} + +static const char state_to_char[] =TASK_STATE_TO_CHAR_STR ;static int task_state_char (unsigned long state)@@ -346,6 +460,12 @@ int register_ftrace_event(struct trace_event *event)WARN_ON (1 ); } +if (!event->context_info) + event->context_info = default_context_info; + +if (!event->lat_context_info) + event->lat_context_info = default_lat_context_info; +if (ftrace_find_event (event->type)) goto out;kernel/trace/trace_output.h +13
-2@@ -6,14 +6,20 @@typedef int (*trace_print_func )(struct trace_seq *s,struct trace_entry *entry,int flags); +typedef int (*context_info_func )(struct trace_seq *s, +struct trace_entry *entry, +struct trace_iterator *iter,int flags); +struct trace_event {struct hlist_node node;int type; -trace_print_func trace; -trace_print_func latency_trace; +trace_print_func trace;/* Usual output on trace or trace_pipe */ +trace_print_func latency_trace;/* Through latency_trace file */ trace_print_func raw;trace_print_func hex;trace_print_func binary; +context_info_func context_info;/* pid/cpu/time on line start */ +context_info_func lat_context_info;/* same in latency_trace */ };extern int trace_seq_printf (struct trace_seq *s,const char *fmt, ...)@@ -33,6 +39,11 @@ int seq_print_userip_objs(const struct userstack_entry *entry,int seq_print_user_ip (struct trace_seq *s,struct mm_struct *mm,unsigned long ip,unsigned long sym_flags); +int default_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags); +int default_lat_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags); +struct trace_event *ftrace_find_event (int type);int register_ftrace_event (struct trace_event *event);int unregister_ftrace_event (struct trace_event *event);Signature · 1 line
1.6.1
Em Fri, Jan 30, 2009 at 12:59:05AM -0800, Frederic Weisbecker escreveu:
Quoted 29 lines
Impact: make
trace_eventmore convenient for tracersAll tracers (for the moment) that use the struct
trace_eventwant to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.But some other tracers that want to implement their
trace_eventcallbacks will not necessary need these information or they may want to format them as they want.This patch adds a new default-enabled trace option:
TRACE_ITER_CONTEXT_INFOWhen disabled through:echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the
sched_switchtracer with context-info (default):bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle> <idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0 <idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0 events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0 0:140:R ==> [000] 11:115:R events/0 11:115:S ==> [000] 0:140:R <idle>
Quoted 7 lines
A tracer can disable it at runtime by clearing the bit
TRACE_ITER_CONTEXT_INFOintrace_flags.Moreover, two callbacks have been added inside
trace_event:
_context_info()which let a tracer override the format of the context info _lat_context_info()which do the same with thelatency_tracefileIf they are not defined, the usual way of printing the context info will be used.
Please wait a bit, I'm trying to use it and the first thing I notice was that I need the trace_iterator in the context callback, to get the timestamp.
- Arnaldo
Em Fri, Jan 30, 2009 at 10:34:46AM -0200, Arnaldo Carvalho de Melo escreveu:
Quoted 36 lines
Em Fri, Jan 30, 2009 at 12:59:05AM -0800, Frederic Weisbecker escreveu:
Quoted 35 lines
Impact: make
trace_eventmore convenient for tracersAll tracers (for the moment) that use the struct
trace_eventwant to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.But some other tracers that want to implement their
trace_eventcallbacks will not necessary need these information or they may want to format them as they want.This patch adds a new default-enabled trace option:
TRACE_ITER_CONTEXT_INFOWhen disabled through:echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the
sched_switchtracer with context-info (default):bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle> <idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0 <idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0 events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0 0:140:R ==> [000] 11:115:R events/0 11:115:S ==> [000] 0:140:R <idle>A tracer can disable it at runtime by clearing the bit
TRACE_ITER_CONTEXT_INFOintrace_flags.Moreover, two callbacks have been added inside
trace_event:
_context_info()which let a tracer override the format of the context info _lat_context_info()which do the same with thelatency_tracefile
Quoted 5 lines
Quoted 1 line
If they are not defined, the usual way of printing the context info will be used.
Please wait a bit, I'm trying to use it and the first thing I notice was that I need the
trace_iteratorin the context callback, to get the timestamp.
Sorry, false alarm, the iterator is there, I was trying to build the whole binary trace record in the trace_event->bin(), but its not possible, so I'll do it in two function calls context + trace.
- Arnaldo
2009/1/30 Arnaldo Carvalho de Melo <[email protected]>:
Quoted 43 lines
Em Fri, Jan 30, 2009 at 10:34:46AM -0200, Arnaldo Carvalho de Melo escreveu:
Quoted 36 lines
Em Fri, Jan 30, 2009 at 12:59:05AM -0800, Frederic Weisbecker escreveu:
Quoted 35 lines
Impact: make
trace_eventmore convenient for tracersAll tracers (for the moment) that use the struct
trace_eventwant to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.But some other tracers that want to implement their
trace_eventcallbacks will not necessary need these information or they may want to format them as they want.This patch adds a new default-enabled trace option:
TRACE_ITER_CONTEXT_INFOWhen disabled through:echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the
sched_switchtracer with context-info (default):bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle> <idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0 <idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0 events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0 0:140:R ==> [000] 11:115:R events/0 11:115:S ==> [000] 0:140:R <idle>A tracer can disable it at runtime by clearing the bit
TRACE_ITER_CONTEXT_INFOintrace_flags.Moreover, two callbacks have been added inside
trace_event:
_context_info()which let a tracer override the format of the context info _lat_context_info()which do the same with thelatency_tracefileQuoted 5 lines
Quoted 1 line
If they are not defined, the usual way of printing the context info will be used.
Please wait a bit, I'm trying to use it and the first thing I notice was that I need the
trace_iteratorin the context callback, to get the timestamp.
Quoted 6 lines
Sorry, false alarm, the iterator is there, I was trying to build the whole binary trace record in the
trace_event->bin(), but its not possible, so I'll do it in two function calls context + trace.- Arnaldo
Do you need the trace_iterator from one of your event print callback? Such as in bin() ?
Em Fri, Jan 30, 2009 at 01:55:50PM +0100, Frédéric Weisbecker escreveu:
Quoted 48 lines
2009/1/30 Arnaldo Carvalho de Melo <[email protected]>:
Quoted 47 lines
Em Fri, Jan 30, 2009 at 10:34:46AM -0200, Arnaldo Carvalho de Melo escreveu:
Quoted 36 lines
Em Fri, Jan 30, 2009 at 12:59:05AM -0800, Frederic Weisbecker escreveu:
Quoted 35 lines
Impact: make
trace_eventmore convenient for tracersAll tracers (for the moment) that use the struct
trace_eventwant to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.But some other tracers that want to implement their
trace_eventcallbacks will not necessary need these information or they may want to format them as they want.This patch adds a new default-enabled trace option:
TRACE_ITER_CONTEXT_INFOWhen disabled through:echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the
sched_switchtracer with context-info (default):bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle> <idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0 <idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0 events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0 0:140:R ==> [000] 11:115:R events/0 11:115:S ==> [000] 0:140:R <idle>A tracer can disable it at runtime by clearing the bit
TRACE_ITER_CONTEXT_INFOintrace_flags.Moreover, two callbacks have been added inside
trace_event:
_context_info()which let a tracer override the format of the context info _lat_context_info()which do the same with thelatency_tracefileQuoted 5 lines
Quoted 1 line
If they are not defined, the usual way of printing the context info will be used.
Please wait a bit, I'm trying to use it and the first thing I notice was that I need the
trace_iteratorin the context callback, to get the timestamp.Sorry, false alarm, the iterator is there, I was trying to build the whole binary trace record in the
trace_event->bin(), but its not possible, so I'll do it in two function calls context + trace.
Quoted 5 lines
Quoted 2 lines
- Arnaldo
Do you need the
trace_iteratorfrom one of your event print callback? Such as inbin()?
Yes, I'm finding the callbacks a complicating factor, I think that we should have instead a flag in the struct trace_event and struct tracer telling that we don't need the context printed and the default routine exported to tracers.
That way minimise change on the old tracers but allow new ones to use the default context to be called from trace_event->trace() and not from trace_event->bin().
So, to summarize, for blktrace I would use:
struct trace_event {
.flags = DONT_PRINT_CONTEXT | OTHER_FUTURE_FLAGS,
.bin = blktrace_print_bin,
.trace = blktrace_print_trace,
}
blktrace_print_bin(iter)
{
full control with access to iter to get timestamp, cpu, etc
}
blktrace_print_trace(iter)
{
print_default_context()
print tracer specific stuff
}
Back to trying to use your patch to show the problems in the form of a working blktrace synthesizer to use with:
cat /d/tracing/trace_pipe | blkparse -i -
- Arnaldo
Em Fri, Jan 30, 2009 at 11:21:26AM -0200, Arnaldo Carvalho de Melo escreveu:
Quoted 83 lines
Em Fri, Jan 30, 2009 at 01:55:50PM +0100, Frédéric Weisbecker escreveu:
Quoted 48 lines
2009/1/30 Arnaldo Carvalho de Melo <[email protected]>:
Quoted 47 lines
Em Fri, Jan 30, 2009 at 10:34:46AM -0200, Arnaldo Carvalho de Melo escreveu:
Quoted 36 lines
Em Fri, Jan 30, 2009 at 12:59:05AM -0800, Frederic Weisbecker escreveu:
Quoted 35 lines
Impact: make
trace_eventmore convenient for tracersAll tracers (for the moment) that use the struct
trace_eventwant to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.But some other tracers that want to implement their
trace_eventcallbacks will not necessary need these information or they may want to format them as they want.This patch adds a new default-enabled trace option:
TRACE_ITER_CONTEXT_INFOWhen disabled through:echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the
sched_switchtracer with context-info (default):bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle> <idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0 <idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0 events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0 0:140:R ==> [000] 11:115:R events/0 11:115:S ==> [000] 0:140:R <idle>A tracer can disable it at runtime by clearing the bit
TRACE_ITER_CONTEXT_INFOintrace_flags.Moreover, two callbacks have been added inside
trace_event:
_context_info()which let a tracer override the format of the context info _lat_context_info()which do the same with thelatency_tracefileQuoted 5 lines
Quoted 1 line
If they are not defined, the usual way of printing the context info will be used.
Please wait a bit, I'm trying to use it and the first thing I notice was that I need the
trace_iteratorin the context callback, to get the timestamp.Sorry, false alarm, the iterator is there, I was trying to build the whole binary trace record in the
trace_event->bin(), but its not possible, so I'll do it in two function calls context + trace.Quoted 5 lines
Quoted 2 lines
- Arnaldo
Do you need the
trace_iteratorfrom one of your event print callback? Such as inbin()?Yes, I'm finding the callbacks a complicating factor, I think that we should have instead a flag in the struct
trace_eventand struct tracer telling that we don't need the context printed and the default routine exported to tracers.That way minimise change on the old tracers but allow new ones to use the default context to be called from
trace_event->trace()and not fromtrace_event->bin().So, to summarize, for blktrace I would use:
struct
trace_event{
.flags =DONT_PRINT_CONTEXT|OTHER_FUTURE_FLAGS,
.bin =blktrace_print_bin,
.trace =blktrace_print_trace,
}
blktrace_print_bin(iter)
{
full control with access to iter to get timestamp, cpu, etc
}
blktrace_print_trace(iter)
{
print_default_context()
print tracer specific stuff
}
Quoted 4 lines
Back to trying to use your patch to show the problems in the form of a working blktrace synthesizer to use with:
cat /d/tracing/trace_pipe | blkparse -i -
Definetely, as it is it doesn't caters to the blktrace binary printing needs.
The ->context info callback is not called if TRACE_ITER_BIN is selected, it should, as doing:
if (trace_flags & TRACE_ITER_CONTEXT_INFO) {
SEQ_PUT_FIELD_RET(s, entry->pid);
SEQ_PUT_FIELD_RET(s, entry->cpu);
SEQ_PUT_FIELD_RET(s, iter->ts);
}is only the default context info for binary mode, what if I want to provide a different context info?
I'll try to rework your patch into something that is useful for my needs and post here.
- Arnaldo
2009/1/30 Arnaldo Carvalho de Melo <[email protected]>:
Quoted 83 lines
Em Fri, Jan 30, 2009 at 11:21:26AM -0200, Arnaldo Carvalho de Melo escreveu:
Quoted 82 lines
Em Fri, Jan 30, 2009 at 01:55:50PM +0100, Frédéric Weisbecker escreveu:
Quoted 48 lines
2009/1/30 Arnaldo Carvalho de Melo <[email protected]>:
Quoted 47 lines
Em Fri, Jan 30, 2009 at 10:34:46AM -0200, Arnaldo Carvalho de Melo escreveu:
Quoted 36 lines
Em Fri, Jan 30, 2009 at 12:59:05AM -0800, Frederic Weisbecker escreveu:
Quoted 35 lines
Impact: make
trace_eventmore convenient for tracersAll tracers (for the moment) that use the struct
trace_eventwant to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.But some other tracers that want to implement their
trace_eventcallbacks will not necessary need these information or they may want to format them as they want.This patch adds a new default-enabled trace option:
TRACE_ITER_CONTEXT_INFOWhen disabled through:echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the
sched_switchtracer with context-info (default):bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle> <idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0 <idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0 events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0 0:140:R ==> [000] 11:115:R events/0 11:115:S ==> [000] 0:140:R <idle>A tracer can disable it at runtime by clearing the bit
TRACE_ITER_CONTEXT_INFOintrace_flags.Moreover, two callbacks have been added inside
trace_event:
_context_info()which let a tracer override the format of the context info _lat_context_info()which do the same with thelatency_tracefileQuoted 5 lines
Quoted 1 line
If they are not defined, the usual way of printing the context info will be used.
Please wait a bit, I'm trying to use it and the first thing I notice was that I need the
trace_iteratorin the context callback, to get the timestamp.Sorry, false alarm, the iterator is there, I was trying to build the whole binary trace record in the
trace_event->bin(), but its not possible, so I'll do it in two function calls context + trace.Quoted 5 lines
Quoted 2 lines
- Arnaldo
Do you need the
trace_iteratorfrom one of your event print callback? Such as inbin()?Yes, I'm finding the callbacks a complicating factor, I think that we should have instead a flag in the struct
trace_eventand struct tracer telling that we don't need the context printed and the default routine exported to tracers.That way minimise change on the old tracers but allow new ones to use the default context to be called from
trace_event->trace()and not fromtrace_event->bin().So, to summarize, for blktrace I would use:
struct
trace_event{.flags = DONT_PRINT_CONTEXT | OTHER_FUTURE_FLAGS, .bin = blktrace_print_bin, .trace = blktrace_print_trace,}
blktrace_print_bin(iter)
{
full control with access to iter to get timestamp, cpu, etc
}
blktrace_print_trace(iter)
{
print_default_context()
print tracer specific stuff
}
I prefer that too.
It's makes it perhaps too much complex to have one callback for the line headers, and one other for the
actual trace line.
IMHO, having all of the current callbacks inside trace_event with the trace iterator as the only argument seems
sufficient to manage the whole line.
And embeeding this flag inside trace_event is better rather having it global, zapping questions like "should we restore it when we switch the tracer, has its value been changed by the user?".
its value changed recently..?)
Quoted 17 lines
Quoted 4 lines
Back to trying to use your patch to show the problems in the form of a working blktrace synthesizer to use with:
cat /d/tracing/trace_pipe | blkparse -i -
Definetely, as it is it doesn't caters to the blktrace binary printing needs.
The ->context info callback is not called if
TRACE_ITER_BINis selected, it should, as doing:if (trace_flags & TRACE_ITER_CONTEXT_INFO) { SEQ_PUT_FIELD_RET(s, entry->pid); SEQ_PUT_FIELD_RET(s, entry->cpu); SEQ_PUT_FIELD_RET(s, iter->ts); }
Quoted 5 lines
is only the default context info for binary mode, what if I want to provide a different context info?
I'll try to rework your patch into something that is useful for my needs and post here.
Ok.
Quoted 2 lines
- Arnaldo
Steven Rostedt
maintainerFrederic and Arnaldo,
I'm fine with this change. Are there other changes you are going to put on top of this, or should I wait for new stuff before pulling it in and sendingo it to Ingo?
-- Steve
Quoted 506 lines · Frederic Weisbecker
Impact: make
trace_eventmore convenient for tracersAll tracers (for the moment) that use the struct
trace_eventwant to have the context info printed before their own output: the pid/cmdline, cpu, and timestamp.But some other tracers that want to implement their
trace_eventcallbacks will not necessary need these information or they may want to format them as they want.This patch adds a new default-enabled trace option:
TRACE_ITER_CONTEXT_INFOWhen disabled through:echo nocontext-info > /debugfs/tracing/trace_options
The pid, cpu and timestamps headers will not be printed.
IE with the
sched_switchtracer with context-info (default):bash-2935 [001] 100.356561: 2935:120:S ==> [001] 0:140:R <idle> <idle>-0 [000] 100.412804: 0:140:R + [000] 11:115:S events/0 <idle>-0 [000] 100.412816: 0:140:R ==> [000] 11:115:R events/0 events/0-11 [000] 100.412829: 11:115:S ==> [000] 0:140:R <idle>Without context-info:
2935:120:S ==> [001] 0:140:R <idle>
0:140:R + [000] 11:115:S events/0 0:140:R ==> [000] 11:115:R events/0 11:115:S ==> [000] 0:140:R <idle>A tracer can disable it at runtime by clearing the bit
TRACE_ITER_CONTEXT_INFOintrace_flags.Moreover, two callbacks have been added inside
trace_event:
_context_info()which let a tracer override the format of the context info _lat_context_info()which do the same with thelatency_tracefileIf they are not defined, the usual way of printing the context info will be used.
--- kernel/trace/trace.c | 155 ++++++++++++------------------------------- kernel/trace/trace.h | 7 ++- kernel/trace/trace_output.c | 120 +++++++++++++++++++++++++++++++++ kernel/trace/trace_output.h | 15 ++++- 4 files changed, 181 insertions(+), 116 deletions(-)kernel/trace/trace.c +42
-113@@ -227,7 +227,7 @@ static DECLARE_WAIT_QUEUE_HEAD(trace_wait);/* trace_flags holds trace_options default values */ unsigned long trace_flags =TRACE_ITER_PRINT_PARENT |TRACE_ITER_PRINTK | -TRACE_ITER_ANNOTATE ; +TRACE_ITER_ANNOTATE |TRACE_ITER_CONTEXT_INFO ;/** * trace_wake_up - wake up tasks waiting for trace input @@ -285,6 +285,7 @@ static const char *trace_options[] = {"userstacktrace" ,"sym-userobj" ,"printk-msg-only" , +"context-info" , NULL };@@ -1171,7 +1172,7 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu, u64 *ent_ts) }/* Find the next real entry, without updating the iterator itself */ -static struct trace_entry * +struct trace_entry *find_next_entry (struct trace_iterator *iter,int *ent_cpu,u64 *ent_ts) {return __find_next_entry (iter, ent_cpu, ent_ts);@@ -1351,57 +1352,6 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)seq_puts (m,"\n" ); } -static void -lat_print_generic (struct trace_seq *s,struct trace_entry *entry,int cpu) -{ -int hardirq, softirq; -char *comm; - - comm =trace_find_cmdline (entry->pid); - -trace_seq_printf (s,"%8.8s-%-5d " , comm, entry->pid); -trace_seq_printf (s,"%3d" , cpu); -trace_seq_printf (s,"%c%c" , - (entry->flags &TRACE_FLAG_IRQS_OFF ) ?'d' : - (entry->flags &TRACE_FLAG_IRQS_NOSUPPORT ) ?'X' :'.' , - ((entry->flags &TRACE_FLAG_NEED_RESCHED ) ?'N' :'.' )); - - hardirq = entry->flags &TRACE_FLAG_HARDIRQ ; - softirq = entry->flags &TRACE_FLAG_SOFTIRQ ; -if (hardirq && softirq) { -trace_seq_putc (s,'H' ); - }else { -if (hardirq) { -trace_seq_putc (s,'h' ); - }else { -if (softirq) -trace_seq_putc (s,'s' ); -else -trace_seq_putc (s,'.' ); - } - } - -if (entry->preempt_count) -trace_seq_printf (s,"%x" , entry->preempt_count); -else -trace_seq_puts (s,"." ); -} - -unsigned long preempt_mark_thresh =100 ; - -static void -lat_print_timestamp (struct trace_seq *s,u64 abs_usecs, -unsigned long rel_usecs) -{ -trace_seq_printf (s," %4lldus" , abs_usecs); -if (rel_usecs > preempt_mark_thresh) -trace_seq_puts (s,"!: " ); -else if (rel_usecs >1 ) -trace_seq_puts (s,"+: " ); -else -trace_seq_puts (s," : " ); -} -static void test_cpu_buff_start (struct trace_iterator *iter) {struct trace_seq *s = &iter->seq;@@ -1419,46 +1369,29 @@ static void test_cpu_buff_start(struct trace_iterator *iter)trace_seq_printf (s,"##### CPU %u buffer started ####\n" , iter->cpu); } -static enum print_line_t -print_lat_fmt (struct trace_iterator *iter,unsigned int trace_idx,int cpu) +static enum print_line_t print_lat_fmt (struct trace_iterator *iter) {struct trace_seq *s = &iter->seq;unsigned long sym_flags = (trace_flags &TRACE_ITER_SYM_MASK ); -struct trace_entry *next_entry;struct trace_event *event; -unsigned long verbose = (trace_flags &TRACE_ITER_VERBOSE );struct trace_entry *entry = iter->ent; -unsigned long abs_usecs; -unsigned long rel_usecs; -u64 next_ts; -char *comm;int ret;test_cpu_buff_start (iter); - next_entry =find_next_entry (iter,NULL , &next_ts); -if (!next_entry) - next_ts = iter->ts; - rel_usecs =ns2usecs (next_ts - iter->ts); - abs_usecs =ns2usecs (iter->ts - iter->tr->time_start); - -if (verbose) { - comm =trace_find_cmdline (entry->pid); -trace_seq_printf (s,"%16s %5d %3d %d %08x %08x [%08lx]" -" %ld.%03ldms (+%ld.%03ldms): " , - comm, - entry->pid, cpu, entry->flags, - entry->preempt_count, trace_idx, -ns2usecs (iter->ts), - abs_usecs/1000 , - abs_usecs %1000 , rel_usecs/1000 , - rel_usecs %1000 ); - }else { -lat_print_generic (s, entry, cpu); -lat_print_timestamp (s, abs_usecs, rel_usecs); + event =ftrace_find_event (entry->type); + +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +if (event) + ret = event->lat_context_info (s, entry, iter, + sym_flags); +else + ret =default_lat_context_info (s, entry, iter, + sym_flags); +if (ret) +return ret; } - event =ftrace_find_event (entry->type);if (event && event->latency_trace) { ret = event->latency_trace (s, entry, sym_flags);if (ret)@@ -1476,33 +1409,23 @@ static enum print_line_t print_trace_fmt(struct trace_iterator *iter)unsigned long sym_flags = (trace_flags &TRACE_ITER_SYM_MASK );struct trace_entry *entry;struct trace_event *event; -unsigned long usec_rem; -unsigned long long t; -unsigned long secs; -char *comm;int ret; entry = iter->ent;test_cpu_buff_start (iter); - comm =trace_find_cmdline (iter->ent->pid); - - t =ns2usecs (iter->ts); - usec_rem =do_div (t,1000000ULL ); - secs = (unsigned long )t; + event =ftrace_find_event (entry->type); - ret =trace_seq_printf (s,"%16s-%-5d " , comm, entry->pid); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; - ret =trace_seq_printf (s,"[%03d] " , iter->cpu); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; - ret =trace_seq_printf (s,"%5lu.%06lu: " , secs, usec_rem); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +if (event) + ret = event->context_info (s, entry, iter, sym_flags); +else + ret =default_context_info (s, entry, iter, sym_flags); +if (ret) +return ret; + } - event =ftrace_find_event (entry->type);if (event && event->trace) { ret = event->trace (s, entry, sym_flags);if (ret)@@ -1525,10 +1448,12 @@ static enum print_line_t print_raw_fmt(struct trace_iterator *iter) entry = iter->ent; - ret =trace_seq_printf (s,"%d %d %llu " , - entry->pid, iter->cpu, iter->ts); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { + ret =trace_seq_printf (s,"%d %d %llu " , + entry->pid, iter->cpu, iter->ts); +if (!ret) +return TRACE_TYPE_PARTIAL_LINE ; + } event =ftrace_find_event (entry->type);if (event && event->raw) {@@ -1553,9 +1478,11 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter) entry = iter->ent; -SEQ_PUT_HEX_FIELD_RET (s, entry->pid); -SEQ_PUT_HEX_FIELD_RET (s, iter->cpu); -SEQ_PUT_HEX_FIELD_RET (s, iter->ts); +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +SEQ_PUT_HEX_FIELD_RET (s, entry->pid); +SEQ_PUT_HEX_FIELD_RET (s, iter->cpu); +SEQ_PUT_HEX_FIELD_RET (s, iter->ts); + } event =ftrace_find_event (entry->type);if (event && event->hex)@@ -1575,7 +1502,7 @@ static enum print_line_t print_printk_msg_only(struct trace_iterator *iter)trace_assign_type (field, entry); - ret =trace_seq_printf (s, field->buf); + ret =trace_seq_printf (s,"%s" , field->buf);if (!ret)return TRACE_TYPE_PARTIAL_LINE ;@@ -1590,9 +1517,11 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) entry = iter->ent; -SEQ_PUT_FIELD_RET (s, entry->pid); -SEQ_PUT_FIELD_RET (s, entry->cpu); -SEQ_PUT_FIELD_RET (s, iter->ts); +if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { +SEQ_PUT_FIELD_RET (s, entry->pid); +SEQ_PUT_FIELD_RET (s, entry->cpu); +SEQ_PUT_FIELD_RET (s, iter->ts); + } event =ftrace_find_event (entry->type);if (event && event->binary)@@ -1643,7 +1572,7 @@ static enum print_line_t print_trace_line(struct trace_iterator *iter)return print_raw_fmt (iter);if (iter->iter_flags &TRACE_FILE_LAT_FMT ) -return print_lat_fmt (iter, iter->idx, iter->cpu); +return print_lat_fmt (iter);return print_trace_fmt (iter); }kernel/trace/trace.h +6
-1@@ -405,6 +405,10 @@ void init_tracer_sysprof_debugfs(struct dentry *d_tracer);struct trace_entry *tracing_get_trace_entry (struct trace_array *tr,struct trace_array_cpu *data); + +struct trace_entry * +find_next_entry (struct trace_iterator *iter,int *ent_cpu,u64 *ent_ts); +void tracing_generic_entry_update (struct trace_entry *entry,unsigned long flags,int pc);@@ -591,7 +595,8 @@ enum trace_iterator_flags {TRACE_ITER_ANNOTATE =0x2000 ,TRACE_ITER_USERSTACKTRACE =0x4000 ,TRACE_ITER_SYM_USEROBJ =0x8000 , - TRACE_ITER_PRINTK_MSGONLY = 0x10000 +TRACE_ITER_PRINTK_MSGONLY =0x10000 , + TRACE_ITER_CONTEXT_INFO = 0x20000 /* Print pid/cpu/time */ };/* kernel/trace/trace_output.c +120
-0@@ -286,6 +286,120 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)return ret; } +static void +lat_print_generic (struct trace_seq *s,struct trace_entry *entry,int cpu) +{ +int hardirq, softirq; +char *comm; + + comm =trace_find_cmdline (entry->pid); + +trace_seq_printf (s,"%8.8s-%-5d " , comm, entry->pid); +trace_seq_printf (s,"%3d" , cpu); +trace_seq_printf (s,"%c%c" , + (entry->flags &TRACE_FLAG_IRQS_OFF ) ?'d' : + (entry->flags &TRACE_FLAG_IRQS_NOSUPPORT ) ?'X' :'.' , + ((entry->flags &TRACE_FLAG_NEED_RESCHED ) ?'N' :'.' )); + + hardirq = entry->flags &TRACE_FLAG_HARDIRQ ; + softirq = entry->flags &TRACE_FLAG_SOFTIRQ ; +if (hardirq && softirq) { +trace_seq_putc (s,'H' ); + }else { +if (hardirq) { +trace_seq_putc (s,'h' ); + }else { +if (softirq) +trace_seq_putc (s,'s' ); +else +trace_seq_putc (s,'.' ); + } + } + +if (entry->preempt_count) +trace_seq_printf (s,"%x" , entry->preempt_count); +else +trace_seq_puts (s,"." ); +} + +static unsigned long preempt_mark_thresh =100 ; + +static void +lat_print_timestamp (struct trace_seq *s,u64 abs_usecs, +unsigned long rel_usecs) +{ +trace_seq_printf (s," %4lldus" , abs_usecs); +if (rel_usecs > preempt_mark_thresh) +trace_seq_puts (s,"!: " ); +else if (rel_usecs >1 ) +trace_seq_puts (s,"+: " ); +else +trace_seq_puts (s," : " ); +} + +int default_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags) +{ +unsigned long usec_rem; +unsigned long long t; +unsigned long secs; +char *comm; + + comm =trace_find_cmdline (entry->pid); + + t =ns2usecs (iter->ts); + usec_rem =do_div (t,USEC_PER_SEC ); + secs = (unsigned long )t; + +if (!trace_seq_printf (s,"%16s-%-5d " , comm, entry->pid)) + goto partial; +if (!trace_seq_printf (s,"[%03d] " , entry->cpu)) + goto partial; +if (!trace_seq_printf (s,"%5lu.%06lu: " , secs, usec_rem)) + goto partial; + +return 0 ; + +partial: +return TRACE_TYPE_PARTIAL_LINE ; +} + +int default_lat_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags) +{ +struct trace_entry *next_entry; +unsigned long verbose = (trace_flags &TRACE_ITER_VERBOSE ); +unsigned long abs_usecs; +unsigned long rel_usecs; +u64 next_ts; +char *comm; + + next_entry =find_next_entry (iter,NULL , &next_ts); +if (!next_entry) + next_ts = iter->ts; + rel_usecs =ns2usecs (next_ts - iter->ts); + abs_usecs =ns2usecs (iter->ts - iter->tr->time_start); + +if (verbose) { + comm =trace_find_cmdline (entry->pid); +trace_seq_printf (s,"%16s %5d %3d %d %08x %08lx [%08lx]" +" %ld.%03ldms (+%ld.%03ldms): " , + comm, + entry->pid, entry->cpu, entry->flags, + entry->preempt_count, iter->idx, +ns2usecs (iter->ts), + abs_usecs/1000 , + abs_usecs %1000 , rel_usecs/1000 , + rel_usecs %1000 ); + }else { +lat_print_generic (s, entry, entry->cpu); +lat_print_timestamp (s, abs_usecs, rel_usecs); + } + +return 0 ; +} + +static const char state_to_char[] =TASK_STATE_TO_CHAR_STR ;static int task_state_char (unsigned long state)@@ -346,6 +460,12 @@ int register_ftrace_event(struct trace_event *event)WARN_ON (1 ); } +if (!event->context_info) + event->context_info = default_context_info; + +if (!event->lat_context_info) + event->lat_context_info = default_lat_context_info; +if (ftrace_find_event (event->type)) goto out;kernel/trace/trace_output.h +13
-2@@ -6,14 +6,20 @@typedef int (*trace_print_func )(struct trace_seq *s,struct trace_entry *entry,int flags); +typedef int (*context_info_func )(struct trace_seq *s, +struct trace_entry *entry, +struct trace_iterator *iter,int flags); +struct trace_event {struct hlist_node node;int type; -trace_print_func trace; -trace_print_func latency_trace; +trace_print_func trace;/* Usual output on trace or trace_pipe */ +trace_print_func latency_trace;/* Through latency_trace file */ trace_print_func raw;trace_print_func hex;trace_print_func binary; +context_info_func context_info;/* pid/cpu/time on line start */ +context_info_func lat_context_info;/* same in latency_trace */ };extern int trace_seq_printf (struct trace_seq *s,const char *fmt, ...)@@ -33,6 +39,11 @@ int seq_print_userip_objs(const struct userstack_entry *entry,int seq_print_user_ip (struct trace_seq *s,struct mm_struct *mm,unsigned long ip,unsigned long sym_flags); +int default_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags); +int default_lat_context_info (struct trace_seq *s,struct trace_entry *entry, +struct trace_iterator *iter,int flags); +struct trace_event *ftrace_find_event (int type);int register_ftrace_event (struct trace_event *event);int unregister_ftrace_event (struct trace_event *event);Signature · 1 line
1.6.1
Em Fri, Jan 30, 2009 at 11:56:41AM -0500, Steven Rostedt escreveu:
Quoted 6 lines
Frederic and Arnaldo,
I'm fine with this change. Are there other changes you are going to put on top of this, or should I wait for new stuff before pulling it in and sendingo it to Ingo?
Steve, please wait a bit, I'm reworking these changes so that they have a first solid user in blktrace, I'll post it later today.
- Arnaldo
cover tracing/blkftrace improvements
Em Fri, Jan 30, 2009 at 03:21:02PM -0200, Arnaldo Carvalho de Melo escreveu:
Quoted 10 lines
Em Fri, Jan 30, 2009 at 11:56:41AM -0500, Steven Rostedt escreveu:
Quoted 6 lines
Frederic and Arnaldo,
I'm fine with this change. Are there other changes you are going to put on top of this, or should I wait for new stuff before pulling it in and sendingo it to Ingo?
Steve, please wait a bit, I'm reworking these changes so that they have a first solid user in blktrace, I'll post it later today.
OK, here it is, please take a look to see if it is acceptable.
Frederic, I kept you as the author for the first patch, as I just trimmed it a little bit, lemme know if this is OK with you.
I removed the callbacks from the patch Frederic submitted, I think its better to have the functions as a library, i.e. if a tracer wants to disable the standard context info for one of its callbacks, it can just call the function for the callbacks it wants.
Then I converted the tracer_event print callbacks to match the struct trace print callback parameter list, i.e. to pass the trace_iterator, from where we can get the trace_seq and the trace_entry, as well as other stuff such as the timestamp.
The last patch makes use of this changes in blktrace, to provide a binary trace that doesn't use the standard context info and that uses the timestamp from the trace_iterator to synthesize most of the data expected by the userspace blktrace utilities.
In the end I think I'll have to have the per cpu sequence numbers in the ftrace plugin to be able to provide exactly what the userspace utilities expect as I couldn't find a way to get it from the ring_buffer or tracing guts (struct trace_array, etc) :-\
- Arnaldo