Re: [RFC][PATCH 07/23 v4] kprobes/tracing: Use trace_seq_has_overflowed() for overflow checks

[Masami Hiramatsu]

(2014/11/14 10:12), Steven Rostedt wrote:
> From: "Steven Rostedt (Red Hat)" <rostedt@xxxxxxxxxxx>
> 
> Instead of checking the return value of trace_seq_printf() and friends
> for overflowing of the buffer, use the trace_seq_has_overflowed() helper
> function.
> 
> This cleans up the code quite a bit and also takes us a step closer to
> changing the return values of trace_seq_printf() and friends to void.

Looks good to me :)

Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>

Thank you,

> 
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
> ---
>  kernel/trace/trace_kprobe.c | 42 ++++++++++++++++--------------------------
>  1 file changed, 16 insertions(+), 26 deletions(-)
> 
> diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
> index 282f6e4e5539..be14b2f091c8 100644
> --- a/kernel/trace/trace_kprobe.c
> +++ b/kernel/trace/trace_kprobe.c
> @@ -1024,27 +1024,22 @@ print_kprobe_event(struct trace_iterator *iter, int flags,
>  	field = (struct kprobe_trace_entry_head *)iter->ent;
>  	tp = container_of(event, struct trace_probe, call.event);
>  
> -	if (!trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call)))
> -		goto partial;
> +	trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call));
>  
>  	if (!seq_print_ip_sym(s, field->ip, flags | TRACE_ITER_SYM_OFFSET))
> -		goto partial;
> +		goto out;
>  
> -	if (!trace_seq_puts(s, ")"))
> -		goto partial;
> +	trace_seq_puts(s, ")");
>  
>  	data = (u8 *)&field[1];
>  	for (i = 0; i < tp->nr_args; i++)
>  		if (!tp->args[i].type->print(s, tp->args[i].name,
>  					     data + tp->args[i].offset, field))
> -			goto partial;
> -
> -	if (!trace_seq_puts(s, "\n"))
> -		goto partial;
> +			goto out;
>  
> -	return TRACE_TYPE_HANDLED;
> -partial:
> -	return TRACE_TYPE_PARTIAL_LINE;
> +	trace_seq_puts(s, "\n");
> + out:
> +	return trace_handle_return(s);
>  }
>  
>  static enum print_line_t
> @@ -1060,33 +1055,28 @@ print_kretprobe_event(struct trace_iterator *iter, int flags,
>  	field = (struct kretprobe_trace_entry_head *)iter->ent;
>  	tp = container_of(event, struct trace_probe, call.event);
>  
> -	if (!trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call)))
> -		goto partial;
> +	trace_seq_printf(s, "%s: (", ftrace_event_name(&tp->call));
>  
>  	if (!seq_print_ip_sym(s, field->ret_ip, flags | TRACE_ITER_SYM_OFFSET))
> -		goto partial;
> +		goto out;
>  
> -	if (!trace_seq_puts(s, " <- "))
> -		goto partial;
> +	trace_seq_puts(s, " <- ");
>  
>  	if (!seq_print_ip_sym(s, field->func, flags & ~TRACE_ITER_SYM_OFFSET))
> -		goto partial;
> +		goto out;
>  
> -	if (!trace_seq_puts(s, ")"))
> -		goto partial;
> +	trace_seq_puts(s, ")");
>  
>  	data = (u8 *)&field[1];
>  	for (i = 0; i < tp->nr_args; i++)
>  		if (!tp->args[i].type->print(s, tp->args[i].name,
>  					     data + tp->args[i].offset, field))
> -			goto partial;
> +			goto out;
>  
> -	if (!trace_seq_puts(s, "\n"))
> -		goto partial;
> +	trace_seq_puts(s, "\n");
>  
> -	return TRACE_TYPE_HANDLED;
> -partial:
> -	return TRACE_TYPE_PARTIAL_LINE;
> + out:
> +	return trace_handle_return(s);
>  }
>  
>  


-- 
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@xxxxxxxxxxx


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/