trace: judicious error checking of trace_seq results
Subsystems (2)
PATCH 1/1 trace: judicious error checking of trace_seq results
Impact: bugfix/cleanup
Some callsites were returning either TRACE_ITER_PARTIAL_LINE if the trace_seq routines (trace_seq_printf, etc) returned 0 meaning its buffer was full, or zero otherwise.
But...
/* Return values for print_line callback */
enum print_line_t {
TRACE_TYPE_PARTIAL_LINE = 0, /* Retry after flushing the seq */
TRACE_TYPE_HANDLED = 1,
TRACE_TYPE_UNHANDLED = 2 /* Relay to other output functions */
};
In other cases the return value was not being relayed at all.
Most of the time it didn't hurt because the page wasn't get filled, but for correctness sake, handle the return values everywhere.
--- block/blktrace.c | 2 +- kernel/trace/trace.c | 75 ++++++++++++-------------- kernel/trace/trace_branch.c | 2 +- kernel/trace/trace_output.c | 123 ++++++++++++++++++------------------------- 4 files changed, 87 insertions(+), 115 deletions(-)
block/blktrace.c +1 -1
@@ -1165,7 +1165,7 @@ static int blk_trace_event_print(struct trace_iterator *iter, int flags)const u16 what = t->action & ((1 <<BLK_TC_SHIFT ) -1 );int ret; -if (trace_print_context (iter)) +if (!trace_print_context (iter))return TRACE_TYPE_PARTIAL_LINE ;if (unlikely (what ==0 || what >ARRAY_SIZE (what2act)))
kernel/trace/trace.c +34 -41
134 lines not on this page · raw message
kernel/trace/trace_branch.c +1 -1
@@ -173,7 +173,7 @@ static int trace_branch_print(struct trace_iterator *iter, int flags) field->line))return TRACE_TYPE_PARTIAL_LINE ; -return 0 ; +return TRACE_TYPE_HANDLED ; }
kernel/trace/trace_output.c +51 -72
268 lines not on this page · raw message
Signature · 1 line
1.6.0.6
Quoted 15 lines · Arnaldo Carvalho de Melo
Impact: bugfix/cleanup
Some callsites were returning either
TRACE_ITER_PARTIAL_LINEif thetrace_seqroutines (trace_seq_printf, etc) returned 0 meaning its buffer was full, or zero otherwise.But...
/* Return values for
print_linecallback */
enumprint_line_t{
TRACE_TYPE_PARTIAL_LINE= 0, /* Retry after flushing the seq */
TRACE_TYPE_HANDLED= 1,
TRACE_TYPE_UNHANDLED= 2 /* Relay to other output functions */
};
Quoted 4 lines
In other cases the return value was not being relayed at all.
Most of the time it didn't hurt because the page wasn't get filled, but for correctness sake, handle the return values everywhere.
Looks like a good cleanup.
Just a small comment below..
Quoted 465 lines
Cc Ingo Molnar <[email protected]>Cc Frédéric Weisbecker <[email protected]>Cc Jens Axboe <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>--- block/blktrace.c | 2 +- kernel/trace/trace.c | 75 ++++++++++++-------------- kernel/trace/trace_branch.c | 2 +- kernel/trace/trace_output.c | 123 ++++++++++++++++++------------------------- 4 files changed, 87 insertions(+), 115 deletions(-)block/blktrace.c +1
-1@@ -1165,7 +1165,7 @@ static int blk_trace_event_print(struct trace_iterator *iter, int flags)const u16 what = t->action & ((1 <<BLK_TC_SHIFT ) -1 );int ret; -if (trace_print_context (iter)) +if (!trace_print_context (iter))return TRACE_TYPE_PARTIAL_LINE ;if (unlikely (what ==0 || what >ARRAY_SIZE (what2act)))kernel/trace/trace.c +34
-41@@ -1402,27 +1402,25 @@ static enum print_line_t print_lat_fmt(struct trace_iterator *iter)unsigned long sym_flags = (trace_flags &TRACE_ITER_SYM_MASK );struct trace_event *event;struct trace_entry *entry = iter->ent; -int ret;test_cpu_buff_start (iter); event =ftrace_find_event (entry->type);if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { - ret =trace_print_lat_context (iter); -if (ret) -return ret; +if (!trace_print_lat_context (iter)) + goto partial; } -if (event && event->latency_trace) { - ret = event->latency_trace (iter, sym_flags); -if (ret) -return ret; -return TRACE_TYPE_HANDLED ; - } +if (event && event->latency_trace) +return event->latency_trace (iter, sym_flags); + +if (!trace_seq_printf (s,"Unknown type %d\n" , entry->type)) + goto partial; -trace_seq_printf (s,"Unknown type %d\n" , entry->type);return TRACE_TYPE_HANDLED ; +partial: +return TRACE_TYPE_PARTIAL_LINE ; }static enum print_line_t print_trace_fmt (struct trace_iterator *iter)@@ -1431,7 +1429,6 @@ 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; -int ret; entry = iter->ent;@@ -1440,22 +1437,19 @@ static enum print_line_t print_trace_fmt(struct trace_iterator *iter) event =ftrace_find_event (entry->type);if (trace_flags &TRACE_ITER_CONTEXT_INFO ) { - ret =trace_print_context (iter); -if (ret) -return ret; +if (!trace_print_context (iter)) + goto partial; } -if (event && event->trace) { - ret = event->trace (iter, sym_flags); -if (ret) -return ret; -return TRACE_TYPE_HANDLED ; - } - ret =trace_seq_printf (s,"Unknown type %d\n" , entry->type); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; +if (event && event->trace) +return event->trace (iter, sym_flags); + +if (!trace_seq_printf (s,"Unknown type %d\n" , entry->type)) + goto partial;return TRACE_TYPE_HANDLED ; +partial: +return TRACE_TYPE_PARTIAL_LINE ; }static enum print_line_t print_raw_fmt (struct trace_iterator *iter)@@ -1463,29 +1457,25 @@ static enum print_line_t print_raw_fmt(struct trace_iterator *iter)struct trace_seq *s = &iter->seq;struct trace_entry *entry;struct trace_event *event; -int ret; entry = iter->ent;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 ; +if (!trace_seq_printf (s,"%d %d %llu " , + entry->pid, iter->cpu, iter->ts)) + goto partial; } event =ftrace_find_event (entry->type); -if (event && event->raw) { - ret = event->raw (iter,0 ); -if (ret) -return ret; -return TRACE_TYPE_HANDLED ; - } - ret =trace_seq_printf (s,"%d ?\n" , entry->type); -if (!ret) -return TRACE_TYPE_PARTIAL_LINE ; +if (event && event->raw) +return event->raw (iter,0 ); + +if (!trace_seq_printf (s,"%d ?\n" , entry->type)) + goto partial;return TRACE_TYPE_HANDLED ; +partial: +return TRACE_TYPE_PARTIAL_LINE ; }static enum print_line_t print_hex_fmt (struct trace_iterator *iter)@@ -1504,8 +1494,11 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter) } event =ftrace_find_event (entry->type); -if (event && event->hex) - event->hex (iter,0 ); +if (event && event->hex) { +int ret = event->hex (iter,0 ); +if (ret !=TRACE_TYPE_HANDLED ) +return ret; + }SEQ_PUT_FIELD_RET (s, newline);@@ -1544,7 +1537,7 @@ static enum print_line_t print_bin_fmt(struct trace_iterator *iter) event =ftrace_find_event (entry->type);if (event && event->binary) - event->binary (iter,0 ); +return event->binary (iter,0 );return TRACE_TYPE_HANDLED ; }kernel/trace/trace_branch.c +1
-1@@ -173,7 +173,7 @@ static int trace_branch_print(struct trace_iterator *iter, int flags) field->line))return TRACE_TYPE_PARTIAL_LINE ; -return 0 ; +return TRACE_TYPE_HANDLED ; }kernel/trace/trace_output.c +50
-71@@ -286,55 +286,41 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)return ret; } -static void +static int 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 (!trace_seq_printf (s,"%8.8s-%-5d %3d%c%c%c" , + comm, entry->pid, cpu, + (entry->flags &TRACE_FLAG_IRQS_OFF ) ?'d' : + (entry->flags &TRACE_FLAG_IRQS_NOSUPPORT ) ? +'X' :'.' , + (entry->flags &TRACE_FLAG_NEED_RESCHED ) ? +'N' :'.' , + (hardirq && softirq) ?'H' : + hardirq ?'h' : softirq ?'s' :'.' )) +return 0 ;if (entry->preempt_count) -trace_seq_printf (s,"%x" , entry->preempt_count); -else -trace_seq_puts (s,"." ); +return trace_seq_printf (s,"%x" , entry->preempt_count); +return trace_seq_puts (s,"." ); }static unsigned long preempt_mark_thresh =100 ; -static void +static int 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," : " ); +return trace_seq_printf (s," %4lldus%c: " , abs_usecs, + rel_usecs > preempt_mark_thresh ?'!' : + rel_usecs >1 ?'+' :' ' ); }int trace_print_context (struct trace_iterator *iter)@@ -346,22 +332,14 @@ int trace_print_context(struct trace_iterator *iter)unsigned long usec_rem =do_div (t,USEC_PER_SEC );unsigned long 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 ; +return trace_seq_printf (s,"%16s-%-5d [%03d] %5lu.%06lu: " , + comm, entry->pid, entry->cpu, secs, usec_rem); }int trace_print_lat_context (struct trace_iterator *iter) {u64 next_ts; +int ret;struct trace_seq *s = &iter->seq;struct trace_entry *entry = iter->ent, *next_entry = trace_find_next_entry(iter, NULL,@@ -376,21 +354,22 @@ int trace_print_lat_context(struct trace_iterator *iter)if (verbose) {char *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 ); + ret =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 /USEC_PER_MSEC , + abs_usecs %USEC_PER_MSEC , + rel_usecs /USEC_PER_MSEC , + rel_usecs %USEC_PER_MSEC ); }else { -lat_print_generic (s, entry, entry->cpu); -lat_print_timestamp (s, abs_usecs, rel_usecs); + ret =lat_print_generic (s, entry, entry->cpu); +if (ret) + ret =lat_print_timestamp (s, abs_usecs, rel_usecs); } -return 0 ; +return ret; }static const char state_to_char[] =TASK_STATE_TO_CHAR_STR ;@@ -486,7 +465,7 @@ int unregister_ftrace_event(struct trace_event *event)int trace_nop_print (struct trace_iterator *iter,int flags) { -return 0 ; +return TRACE_TYPE_HANDLED ; }/* TRACE_FN */ @@ -506,7 +485,7 @@ static int trace_fn_latency(struct trace_iterator *iter, int flags)if (!trace_seq_puts (s,")\n" )) goto partial; -return 0 ; +return TRACE_TYPE_HANDLED ; partial:return TRACE_TYPE_PARTIAL_LINE ;@@ -533,7 +512,7 @@ static int trace_fn_trace(struct trace_iterator *iter, int flags)if (!trace_seq_printf (s,"\n" )) goto partial; -return 0 ; +return TRACE_TYPE_HANDLED ; partial:return TRACE_TYPE_PARTIAL_LINE ;@@ -550,7 +529,7 @@ static int trace_fn_raw(struct trace_iterator *iter, int flags) field->parent_ip))return TRACE_TYPE_PARTIAL_LINE ; -return 0 ; +return TRACE_TYPE_HANDLED ; }static int trace_fn_hex (struct trace_iterator *iter,int flags)@@ -563,7 +542,7 @@ static int trace_fn_hex(struct trace_iterator *iter, int flags)SEQ_PUT_HEX_FIELD_RET (s, field->ip);SEQ_PUT_HEX_FIELD_RET (s, field->parent_ip); -return 0 ; +return TRACE_TYPE_HANDLED ; }static int trace_fn_bin (struct trace_iterator *iter,int flags)@@ -576,7 +555,7 @@ static int trace_fn_bin(struct trace_iterator *iter, int flags)SEQ_PUT_FIELD_RET (s, field->ip);SEQ_PUT_FIELD_RET (s, field->parent_ip); -return 0 ; +return TRACE_TYPE_HANDLED ; }static struct trace_event trace_fn_event = {@@ -611,7 +590,7 @@ static int trace_ctxwake_print(struct trace_iterator *iter, char *delim) T, comm))return TRACE_TYPE_PARTIAL_LINE ; -return 0 ; +return TRACE_TYPE_HANDLED ; }static int trace_ctx_print (struct trace_iterator *iter,int flags)@@ -644,7 +623,7 @@ static int trace_ctxwake_raw(struct trace_iterator *iter, char S) T))return TRACE_TYPE_PARTIAL_LINE ; -return 0 ; +return TRACE_TYPE_HANDLED ; }static int trace_ctx_raw (struct trace_iterator *iter,int flags)@@ -678,7 +657,7 @@ static int trace_ctxwake_hex(struct trace_iterator *iter, char S)SEQ_PUT_HEX_FIELD_RET (s, field->next_prio);SEQ_PUT_HEX_FIELD_RET (s,T ); -return 0 ; +return TRACE_TYPE_HANDLED ; }static int trace_ctx_hex (struct trace_iterator *iter,int flags)@@ -705,7 +684,7 @@ static int trace_ctxwake_bin(struct trace_iterator *iter, int flags)SEQ_PUT_FIELD_RET (s, field->next_prio);SEQ_PUT_FIELD_RET (s, field->next_state); -return 0 ; +return TRACE_TYPE_HANDLED ; }static struct trace_event trace_ctx_event = {@@ -739,7 +718,7 @@ static int trace_special_print(struct trace_iterator *iter, int flags) field->arg3))return TRACE_TYPE_PARTIAL_LINE ; -return 0 ; +return TRACE_TYPE_HANDLED ; }static int trace_special_hex (struct trace_iterator *iter,int flags)@@ -753,7 +732,7 @@ static int trace_special_hex(struct trace_iterator *iter, int flags)SEQ_PUT_HEX_FIELD_RET (s, field->arg2);SEQ_PUT_HEX_FIELD_RET (s, field->arg3); -return 0 ; +return TRACE_TYPE_HANDLED ; }static int trace_special_bin (struct trace_iterator *iter,int flags)@@ -767,7 +746,7 @@ static int trace_special_bin(struct trace_iterator *iter, int flags)SEQ_PUT_FIELD_RET (s, field->arg2);SEQ_PUT_FIELD_RET (s, field->arg3); -return 0 ; +return TRACE_TYPE_HANDLED ; }static struct trace_event trace_special_event = {@@ -801,7 +780,7 @@ static int trace_stack_print(struct trace_iterator *iter, int flags) goto partial; } -return 0 ; +return TRACE_TYPE_HANDLED ; partial:return TRACE_TYPE_PARTIAL_LINE ;@@ -830,7 +809,7 @@ static int trace_user_stack_print(struct trace_iterator *iter, int flags)if (!trace_seq_putc (s,'\n' )) goto partial; -return 0 ; +return TRACE_TYPE_HANDLED ; partial:return TRACE_TYPE_PARTIAL_LINE ;@@ -859,7 +838,7 @@ static int trace_print_print(struct trace_iterator *iter, int flags)if (!trace_seq_printf (s,": %s" , field->buf)) goto partial; -return 0 ; +return TRACE_TYPE_HANDLED ; partial:return TRACE_TYPE_PARTIAL_LINE ;
kernel/trace/trace_output.c static int trace_print_raw(struct trace_iterator *iter, int flags) · line 859
Quoted 8 lines
kernel/trace/trace_output.c +1
-1@@ -874,7 +853,7 @@ static int trace_print_raw(struct trace_iterator *iter, int flags)if (!trace_seq_printf (&iter->seq,"# %lx %s" , field->ip, field->buf)) goto partial; -return 0 ; +return TRACE_TYPE_HANDLED ; partial:return TRACE_TYPE_PARTIAL_LINE ;
Shouldn't these callbacks be converted into enum print_line_t ? Perhaps for the future users who will define their own callbacks, giving more hints about the return type...even if an enum is still an int.
Quoted 3 lines
Signature · 1 line
1.6.0.6
PATCH 1/1 trace: Make the trace_event callbacks return enum print_line_t
As they actually all return these enumerators.
block/blktrace.c +4 -2
@@ -1158,7 +1158,8 @@ static struct { [__BLK_TA_REMAP] = {{ "A", "remap" }, blk_log_remap }, }; -static int blk_trace_event_print (struct trace_iterator *iter,int flags) +static enum print_line_t blk_trace_event_print (struct trace_iterator *iter, +int flags) {struct trace_seq *s = &iter->seq;const struct blk_io_trace *t = (struct blk_io_trace *)iter->ent;
@@ -1196,7 +1197,8 @@ static int blk_trace_synthesize_old_trace(struct trace_iterator *iter) sizeof(old) - offset + t->pdu_len); } -static int blk_trace_event_print_binary (struct trace_iterator *iter,int flags) +static enum print_line_t +blk_trace_event_print_binary (struct trace_iterator *iter,int flags) {return blk_trace_synthesize_old_trace (iter) ?TRACE_TYPE_HANDLED :TRACE_TYPE_PARTIAL_LINE ;
kernel/trace/trace.c +1 -1
@@ -1495,7 +1495,7 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter) event =ftrace_find_event (entry->type);if (event && event->hex) { -int ret = event->hex (iter,0 ); +enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret; }
kernel/trace/trace_branch.c +2 -1
@@ -160,7 +160,8 @@ trace_print_print(struct trace_seq *s, struct trace_entry *entry, int flags)return TRACE_TYPE_PARTIAL_LINE ; } -static int trace_branch_print (struct trace_iterator *iter,int flags) +static enum print_line_t trace_branch_print (struct trace_iterator *iter, +int flags) {struct trace_branch *field;
kernel/trace/trace_output.c +31 -21
169 lines not on this page · raw message
kernel/trace/trace_output.h +3 -2
@@ -3,7 +3,8 @@#include "trace.h" -typedef int (*trace_print_func )(struct trace_iterator *iter,int flags); +typedef enum print_line_t (*trace_print_func )(struct trace_iterator *iter, +int flags);struct trace_event {struct hlist_node node;
@@ -39,7 +40,7 @@ struct trace_event *ftrace_find_event(int type);int register_ftrace_event (struct trace_event *event);int unregister_ftrace_event (struct trace_event *event); -int trace_nop_print (struct trace_iterator *iter,int flags); +enum print_line_t trace_nop_print (struct trace_iterator *iter,int flags);#define MAX_MEMHEX_BYTES 8#define HEX_CHARS (MAX_MEMHEX_BYTES*2 + 1)
Re: [PATCH tip 1/1] trace: Make the trace_event callbacks return enum print_line_t
Quoted 4 lines · Arnaldo Carvalho de Melo
As they actually all return these enumerators.
Reported-by Frederic Weisbecker <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
Thanks.
I'm currently working on the implementation of the subevents, hopefully it will actually make the things simplier for tracers like blk.
I'm not sure, will see the result and your comments :-)
Quoted 263 lines
block/blktrace.c +4
-2@@ -1158,7 +1158,8 @@ static struct { [__BLK_TA_REMAP] = {{ "A", "remap" }, blk_log_remap }, }; -static int blk_trace_event_print (struct trace_iterator *iter,int flags) +static enum print_line_t blk_trace_event_print (struct trace_iterator *iter, +int flags) {struct trace_seq *s = &iter->seq;const struct blk_io_trace *t = (struct blk_io_trace *)iter->ent;@@ -1196,7 +1197,8 @@ static int blk_trace_synthesize_old_trace(struct trace_iterator *iter) sizeof(old) - offset + t->pdu_len); } -static int blk_trace_event_print_binary (struct trace_iterator *iter,int flags) +static enum print_line_t +blk_trace_event_print_binary (struct trace_iterator *iter,int flags) {return blk_trace_synthesize_old_trace (iter) ?TRACE_TYPE_HANDLED :TRACE_TYPE_PARTIAL_LINE ;kernel/trace/trace.c +1
-1@@ -1495,7 +1495,7 @@ static enum print_line_t print_hex_fmt(struct trace_iterator *iter) event =ftrace_find_event (entry->type);if (event && event->hex) { -int ret = event->hex (iter,0 ); +enum print_line_t ret = event->hex (iter,0 );if (ret !=TRACE_TYPE_HANDLED )return ret; }kernel/trace/trace_branch.c +2
-1@@ -160,7 +160,8 @@ trace_print_print(struct trace_seq *s, struct trace_entry *entry, int flags)return TRACE_TYPE_PARTIAL_LINE ; } -static int trace_branch_print (struct trace_iterator *iter,int flags) +static enum print_line_t trace_branch_print (struct trace_iterator *iter, +int flags) {struct trace_branch *field;kernel/trace/trace_output.c +31
-21@@ -463,13 +463,14 @@ int unregister_ftrace_event(struct trace_event *event)* Standard events */ -int trace_nop_print (struct trace_iterator *iter,int flags) +enum print_line_t trace_nop_print (struct trace_iterator *iter,int flags) {return TRACE_TYPE_HANDLED ; }/* TRACE_FN */ -static int trace_fn_latency (struct trace_iterator *iter,int flags) +static enum print_line_t trace_fn_latency (struct trace_iterator *iter, +int flags) {struct ftrace_entry *field;struct trace_seq *s = &iter->seq;@@ -491,7 +492,7 @@ static int trace_fn_latency(struct trace_iterator *iter, int flags)return TRACE_TYPE_PARTIAL_LINE ; } -static int trace_fn_trace (struct trace_iterator *iter,int flags) +static enum print_line_t trace_fn_trace (struct trace_iterator *iter,int flags) {struct ftrace_entry *field;struct trace_seq *s = &iter->seq;@@ -518,7 +519,7 @@ static int trace_fn_trace(struct trace_iterator *iter, int flags)return TRACE_TYPE_PARTIAL_LINE ; } -static int trace_fn_raw (struct trace_iterator *iter,int flags) +static enum print_line_t trace_fn_raw (struct trace_iterator *iter,int flags) {struct ftrace_entry *field;@@ -532,7 +533,7 @@ static int trace_fn_raw(struct trace_iterator *iter, int flags)return TRACE_TYPE_HANDLED ; } -static int trace_fn_hex (struct trace_iterator *iter,int flags) +static enum print_line_t trace_fn_hex (struct trace_iterator *iter,int flags) {struct ftrace_entry *field;struct trace_seq *s = &iter->seq;@@ -545,7 +546,7 @@ static int trace_fn_hex(struct trace_iterator *iter, int flags)return TRACE_TYPE_HANDLED ; } -static int trace_fn_bin (struct trace_iterator *iter,int flags) +static enum print_line_t trace_fn_bin (struct trace_iterator *iter,int flags) {struct ftrace_entry *field;struct trace_seq *s = &iter->seq;@@ -568,7 +569,8 @@ static struct trace_event trace_fn_event = { };/* TRACE_CTX an TRACE_WAKE */ -static int trace_ctxwake_print (struct trace_iterator *iter,char *delim) +static enum print_line_t trace_ctxwake_print (struct trace_iterator *iter, +char *delim) {struct ctx_switch_entry *field;char *comm;@@ -593,12 +595,13 @@ static int trace_ctxwake_print(struct trace_iterator *iter, char *delim)return TRACE_TYPE_HANDLED ; } -static int trace_ctx_print (struct trace_iterator *iter,int flags) +static enum print_line_t trace_ctx_print (struct trace_iterator *iter,int flags) {return trace_ctxwake_print (iter,"==>" ); } -static int trace_wake_print (struct trace_iterator *iter,int flags) +static enum print_line_t trace_wake_print (struct trace_iterator *iter, +int flags) {return trace_ctxwake_print (iter," +" ); }@@ -626,12 +629,12 @@ static int trace_ctxwake_raw(struct trace_iterator *iter, char S)return TRACE_TYPE_HANDLED ; } -static int trace_ctx_raw (struct trace_iterator *iter,int flags) +static enum print_line_t trace_ctx_raw (struct trace_iterator *iter,int flags) {return trace_ctxwake_raw (iter,0 ); } -static int trace_wake_raw (struct trace_iterator *iter,int flags) +static enum print_line_t trace_wake_raw (struct trace_iterator *iter,int flags) {return trace_ctxwake_raw (iter,'+' ); }@@ -660,17 +663,18 @@ static int trace_ctxwake_hex(struct trace_iterator *iter, char S)return TRACE_TYPE_HANDLED ; } -static int trace_ctx_hex (struct trace_iterator *iter,int flags) +static enum print_line_t trace_ctx_hex (struct trace_iterator *iter,int flags) {return trace_ctxwake_hex (iter,0 ); } -static int trace_wake_hex (struct trace_iterator *iter,int flags) +static enum print_line_t trace_wake_hex (struct trace_iterator *iter,int flags) {return trace_ctxwake_hex (iter,'+' ); } -static int trace_ctxwake_bin (struct trace_iterator *iter,int flags) +static enum print_line_t trace_ctxwake_bin (struct trace_iterator *iter, +int flags) {struct ctx_switch_entry *field;struct trace_seq *s = &iter->seq;@@ -706,7 +710,8 @@ static struct trace_event trace_wake_event = { };/* TRACE_SPECIAL */ -static int trace_special_print (struct trace_iterator *iter,int flags) +static enum print_line_t trace_special_print (struct trace_iterator *iter, +int flags) {struct special_entry *field;@@ -721,7 +726,8 @@ static int trace_special_print(struct trace_iterator *iter, int flags)return TRACE_TYPE_HANDLED ; } -static int trace_special_hex (struct trace_iterator *iter,int flags) +static enum print_line_t trace_special_hex (struct trace_iterator *iter, +int flags) {struct special_entry *field;struct trace_seq *s = &iter->seq;@@ -735,7 +741,8 @@ static int trace_special_hex(struct trace_iterator *iter, int flags)return TRACE_TYPE_HANDLED ; } -static int trace_special_bin (struct trace_iterator *iter,int flags) +static enum print_line_t trace_special_bin (struct trace_iterator *iter, +int flags) {struct special_entry *field;struct trace_seq *s = &iter->seq;@@ -760,7 +767,8 @@ static struct trace_event trace_special_event = {/* TRACE_STACK */ -static int trace_stack_print (struct trace_iterator *iter,int flags) +static enum print_line_t trace_stack_print (struct trace_iterator *iter, +int flags) {struct stack_entry *field;struct trace_seq *s = &iter->seq;@@ -796,7 +804,8 @@ static struct trace_event trace_stack_event = { };/* TRACE_USER_STACK */ -static int trace_user_stack_print (struct trace_iterator *iter,int flags) +static enum print_line_t trace_user_stack_print (struct trace_iterator *iter, +int flags) {struct userstack_entry *field;struct trace_seq *s = &iter->seq;@@ -825,7 +834,8 @@ static struct trace_event trace_user_stack_event = { };/* TRACE_PRINT */ -static int trace_print_print (struct trace_iterator *iter,int flags) +static enum print_line_t trace_print_print (struct trace_iterator *iter, +int flags) {struct print_entry *field;struct trace_seq *s = &iter->seq;@@ -844,7 +854,7 @@ static int trace_print_print(struct trace_iterator *iter, int flags)return TRACE_TYPE_PARTIAL_LINE ; } -static int trace_print_raw (struct trace_iterator *iter,int flags) +static enum print_line_t trace_print_raw (struct trace_iterator *iter,int flags) {struct print_entry *field;kernel/trace/trace_output.h +3
-2@@ -3,7 +3,8 @@#include "trace.h" -typedef int (*trace_print_func )(struct trace_iterator *iter,int flags); +typedef enum print_line_t (*trace_print_func )(struct trace_iterator *iter, +int flags);struct trace_event {struct hlist_node node;@@ -39,7 +40,7 @@ struct trace_event *ftrace_find_event(int type);int register_ftrace_event (struct trace_event *event);int unregister_ftrace_event (struct trace_event *event); -int trace_nop_print (struct trace_iterator *iter,int flags); +enum print_line_t trace_nop_print (struct trace_iterator *iter,int flags);#define MAX_MEMHEX_BYTES 8#define HEX_CHARS (MAX_MEMHEX_BYTES*2 + 1)
Ingo Molnar
AppliedQuoted 15 lines · Arnaldo Carvalho de Melo
Impact: bugfix/cleanup
Some callsites were returning either
TRACE_ITER_PARTIAL_LINEif thetrace_seqroutines (trace_seq_printf, etc) returned 0 meaning its buffer was full, or zero otherwise.But...
/* Return values for
print_linecallback */
enumprint_line_t{
TRACE_TYPE_PARTIAL_LINE= 0, /* Retry after flushing the seq */
TRACE_TYPE_HANDLED= 1,
TRACE_TYPE_UNHANDLED= 2 /* Relay to other output functions */
};
Quoted 4 lines
In other cases the return value was not being relayed at all.
Most of the time it didn't hurt because the page wasn't get filled, but for correctness sake, handle the return values everywhere.
applied to tip:tracing/ftrace, thanks Arnaldo!
Ingo
Re: [PATCH tip 1/1] trace: Make the trace_event callbacks return enum print_line_t
In reply to Arnaldo Carvalho de MeloQuoted 5 lines · Arnaldo Carvalho de Melo
As they actually all return these enumerators.
Reported-by Frederic Weisbecker <[email protected]>Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
applied to tip:tracing/ftrace, thanks Arnaldo!
Ingo
ps. the diffstat was missing - it's usually handy on lkml