Commit ef56e047 authored by Piotr Maziarz's avatar Piotr Maziarz Committed by Steven Rostedt (VMware)
Browse files

tracing: Use seq_buf_hex_dump() to dump buffers 

Without this, buffers can be printed with __print_array macro that has
no formatting options and can be hard to read. The other way is to
mimic formatting capability with multiple calls of trace event with one
call per row which gives performance impact and different timestamp in
each row.

Link: http://lkml.kernel.org/r/1573130738-29390-2-git-send-email-piotrx.maziarz@linux.intel.com



Signed-off-by: default avatarPiotr Maziarz <piotrx.maziarz@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 353cade3

include/linux/trace_events.h

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ const char *trace_print_array_seq(struct trace_seq *p, 
				   const void *buf, int count,

				   size_t el_size);



const char *

trace_print_hex_dump_seq(struct trace_seq *p, const char *prefix_str,

			 int prefix_type, int rowsize, int groupsize,

			 const void *buf, size_t len, bool ascii);



struct trace_iterator;

struct trace_event;

include/linux/trace_seq.h

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ extern int trace_seq_path(struct trace_seq *s, const struct path *path); 
extern void trace_seq_bitmask(struct trace_seq *s, const unsigned long *maskp,

			     int nmaskbits);



extern int trace_seq_hex_dump(struct trace_seq *s, const char *prefix_str,

			      int prefix_type, int rowsize, int groupsize,

			      const void *buf, size_t len, bool ascii);



#else /* CONFIG_TRACING */

static inline void trace_seq_printf(struct trace_seq *s, const char *fmt, ...)

{

include/trace/trace_events.h

+6 −0
Original line number Diff line number Diff line
@@ -340,6 +340,12 @@ TRACE_MAKE_SYSTEM_STR(); 
		trace_print_array_seq(p, array, count, el_size);	\

	})



#undef __print_hex_dump

#define __print_hex_dump(prefix_str, prefix_type,			\

			 rowsize, groupsize, buf, len, ascii)		\

	trace_print_hex_dump_seq(p, prefix_str, prefix_type,		\

				 rowsize, groupsize, buf, len, ascii)



#undef DECLARE_EVENT_CLASS

#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)	\

static notrace enum print_line_t					\

kernel/trace/trace_output.c

+15 −0
Original line number Diff line number Diff line
@@ -274,6 +274,21 @@ trace_print_array_seq(struct trace_seq *p, const void *buf, int count, 
}

EXPORT_SYMBOL(trace_print_array_seq);



const char *

trace_print_hex_dump_seq(struct trace_seq *p, const char *prefix_str,

			 int prefix_type, int rowsize, int groupsize,

			 const void *buf, size_t len, bool ascii)

{

	const char *ret = trace_seq_buffer_ptr(p);



	trace_seq_putc(p, '\n');

	trace_seq_hex_dump(p, prefix_str, prefix_type,

			   rowsize, groupsize, buf, len, ascii);

	trace_seq_putc(p, 0);

	return ret;

}

EXPORT_SYMBOL(trace_print_hex_dump_seq);



int trace_raw_output_prep(struct trace_iterator *iter,

			  struct trace_event *trace_event)

{

kernel/trace/trace_seq.c

+30 −0
Original line number Diff line number Diff line
@@ -376,3 +376,33 @@ int trace_seq_to_user(struct trace_seq *s, char __user *ubuf, int cnt) 
	return seq_buf_to_user(&s->seq, ubuf, cnt);

}

EXPORT_SYMBOL_GPL(trace_seq_to_user);



int trace_seq_hex_dump(struct trace_seq *s, const char *prefix_str,

		       int prefix_type, int rowsize, int groupsize,

		       const void *buf, size_t len, bool ascii)

{

		unsigned int save_len = s->seq.len;



	if (s->full)

		return 0;



	__trace_seq_init(s);



	if (TRACE_SEQ_BUF_LEFT(s) < 1) {

		s->full = 1;

		return 0;

	}



	seq_buf_hex_dump(&(s->seq), prefix_str,

		   prefix_type, rowsize, groupsize,

		   buf, len, ascii);



	if (unlikely(seq_buf_has_overflowed(&s->seq))) {

		s->seq.len = save_len;

		s->full = 1;

		return 0;

	}



	return 1;

}

EXPORT_SYMBOL(trace_seq_hex_dump);

CRA Git | Maintained and supported by SUSTech CRA and CCSE