From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932258AbdA3Uod (ORCPT ); Mon, 30 Jan 2017 15:44:33 -0500 Received: from smtprelay0063.hostedemail.com ([216.40.44.63]:54400 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754303AbdA3Uoc (ORCPT ); Mon, 30 Jan 2017 15:44:32 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1431:1437:1515:1516:1518:1534:1543:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3355:3622:3865:3866:3867:3868:3872:3874:4321:5007:6261:7875:10004:10400:10848:10967:11026:11232:11473:11658:11914:12043:12296:12438:12555:12740:12760:12895:12986:13255:13439:14093:14097:14181:14659:14721:21080:21451:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:3,LUA_SUMMARY:none X-HE-Tag: prose18_9d1faebe2907 X-Filterd-Recvd-Size: 4265 Date: Mon, 30 Jan 2017 15:44:25 -0500 From: Steven Rostedt To: Daniel Borkmann Cc: davem@davemloft.net, ast@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo Subject: Re: [PATCH net-next 1/3] trace: add variant without spacing in trace_print_hex_seq Message-ID: <20170130154425.581bf631@gandalf.local.home> In-Reply-To: References: X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 25 Jan 2017 02:28:16 +0100 Daniel Borkmann wrote: > For upcoming tracepoint support for BPF, we want to dump the program's > tag. Format should be similar to __print_hex(), but without spacing. > Add a __print_hex_str() variant for exactly that purpose that reuses > trace_print_hex_seq(). > > Signed-off-by: Daniel Borkmann > Cc: Steven Rostedt > Cc: Arnaldo Carvalho de Melo > --- > include/linux/trace_events.h | 3 ++- > include/trace/trace_events.h | 8 +++++++- > kernel/trace/trace_output.c | 7 ++++--- > 3 files changed, 13 insertions(+), 5 deletions(-) > > diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h > index be00761..cfa475a 100644 > --- a/include/linux/trace_events.h > +++ b/include/linux/trace_events.h > @@ -33,7 +33,8 @@ const char *trace_print_bitmask_seq(struct trace_seq *p, void *bitmask_ptr, > unsigned int bitmask_size); > > const char *trace_print_hex_seq(struct trace_seq *p, > - const unsigned char *buf, int len); > + const unsigned char *buf, int len, > + bool spacing); Hmm, "spacing" doesn't really mean much. What about the invert of it, and have "concatenate"? > > const char *trace_print_array_seq(struct trace_seq *p, > const void *buf, int count, > diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h > index 467e12f..9f68462 100644 > --- a/include/trace/trace_events.h > +++ b/include/trace/trace_events.h > @@ -297,7 +297,12 @@ > #endif > > #undef __print_hex > -#define __print_hex(buf, buf_len) trace_print_hex_seq(p, buf, buf_len) > +#define __print_hex(buf, buf_len) \ > + trace_print_hex_seq(p, buf, buf_len, true) > + > +#undef __print_hex_str > +#define __print_hex_str(buf, buf_len) \ > + trace_print_hex_seq(p, buf, buf_len, false) > > #undef __print_array > #define __print_array(array, count, el_size) \ > @@ -711,6 +716,7 @@ > #undef __print_flags > #undef __print_symbolic > #undef __print_hex > +#undef __print_hex_str > #undef __get_dynamic_array > #undef __get_dynamic_array_len > #undef __get_str > diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c > index 5d33a73..30a144b1 100644 > --- a/kernel/trace/trace_output.c > +++ b/kernel/trace/trace_output.c > @@ -163,14 +163,15 @@ enum print_line_t trace_print_printk_msg_only(struct trace_iterator *iter) > EXPORT_SYMBOL_GPL(trace_print_bitmask_seq); > With the addition of this boolean parameter, this function shold probably have a kernel doc header, that can explain the parameters. -- Steve > const char * > -trace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len) > +trace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len, > + bool spacing) > { > int i; > const char *ret = trace_seq_buffer_ptr(p); > > for (i = 0; i < buf_len; i++) > - trace_seq_printf(p, "%s%2.2x", i == 0 ? "" : " ", buf[i]); > - > + trace_seq_printf(p, "%s%2.2x", !spacing || i == 0 ? "" : " ", > + buf[i]); > trace_seq_putc(p, 0); > > return ret;