Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c65c83ff authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf trace: Allow asking for not suppressing common string prefixes 

So far we've been suppressing common stuff such as "MAP_" in the mmap
flags, showing "SHARED" instead of "MAP_SHARED", allow for those
prefixes (and a few suffixes) to be shown:

  # trace -e *map,open*,*seek sleep 1
  openat("/etc/ld.so.cache", CLOEXEC) = 3
  mmap(0, 109093, READ, PRIVATE, 3, 0) = 0x7ff61c695000
  openat("/lib64/libc.so.6", CLOEXEC) = 3
  lseek(3, 792, SET) = 792
  mmap(0, 8192, READ|WRITE, PRIVATE|ANONYMOUS) = 0x7ff61c693000
  lseek(3, 792, SET) = 792
  lseek(3, 864, SET) = 864
  mmap(0, 1857568, READ, PRIVATE|DENYWRITE, 3, 0) = 0x7ff61c4cd000
  mmap(0x7ff61c4ef000, 1363968, EXEC|READ, PRIVATE|FIXED|DENYWRITE, 3, 139264) = 0x7ff61c4ef000
  mmap(0x7ff61c63c000, 311296, READ, PRIVATE|FIXED|DENYWRITE, 3, 1503232) = 0x7ff61c63c000
  mmap(0x7ff61c689000, 24576, READ|WRITE, PRIVATE|FIXED|DENYWRITE, 3, 1814528) = 0x7ff61c689000
  mmap(0x7ff61c68f000, 14368, READ|WRITE, PRIVATE|FIXED|ANONYMOUS) = 0x7ff61c68f000
  munmap(0x7ff61c695000, 109093) = 0
  openat("/usr/lib/locale/locale-archive", CLOEXEC) = 3
  mmap(0, 217749968, READ, PRIVATE, 3, 0) = 0x7ff60f523000
  #
  # vim ~/.perfconfig
  #
  # perf config
  llvm.dump-obj=true
  trace.add_events=/home/acme/git/perf/tools/perf/examples/bpf/augmented_raw_syscalls.o
  trace.show_zeros=yes
  trace.show_duration=no
  trace.no_inherit=yes
  trace.show_timestamp=no
  trace.show_arg_names=no
  trace.args_alignment=0
  trace.string_quote="
  trace.show_prefix=yes
  #
  #
  # trace -e *map,open*,*seek sleep 1
  openat(AT_FDCWD, "/etc/ld.so.cache", O_CLOEXEC) = 3
  mmap(0, 109093, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f7ebbe59000
  openat(AT_FDCWD, "/lib64/libc.so.6", O_CLOEXEC) = 3
  lseek(3, 792, SEEK_SET) = 792
  mmap(0, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS) = 0x7f7ebbe57000
  lseek(3, 792, SEEK_SET) = 792
  lseek(3, 864, SEEK_SET) = 864
  mmap(0, 1857568, PROT_READ, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f7ebbc91000
  mmap(0x7f7ebbcb3000, 1363968, PROT_EXEC|PROT_READ, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 139264) = 0x7f7ebbcb3000
  mmap(0x7f7ebbe00000, 311296, PROT_READ, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 1503232) = 0x7f7ebbe00000
  mmap(0x7f7ebbe4d000, 24576, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 1814528) = 0x7f7ebbe4d000
  mmap(0x7f7ebbe53000, 14368, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS) = 0x7f7ebbe53000
  munmap(0x7f7ebbe59000, 109093) = 0
  openat(AT_FDCWD, "/usr/lib/locale/locale-archive", O_CLOEXEC) = 3
  mmap(0, 217749968, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f7eaece7000
  #

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Luis Cláudio Gonçalves <lclaudio@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-mtn1i4rjowjl72trtnbmvjd4@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2e3d7fac

tools/perf/Documentation/perf-config.txt

+4 −0
Original line number Diff line number Diff line
@@ -543,6 +543,10 @@ trace.*:: 
	trace.show_duration::

		Show syscall duration.



	trace.show_prefix::

		If set to 'yes' will show common string prefixes in tables. The default

		is to remove the common prefix in things like "MAP_SHARED", showing just "SHARED".



	trace.show_timestamp::

		Show syscall start timestamp.

tools/perf/builtin-trace.c

+20 −10
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ struct trace { 
	bool			show_duration;

	bool			show_zeros;

	bool			show_arg_names;

	bool			show_string_prefix;

	bool			force;

	bool			vfs_getname;

	int			trace_pgfaults;
@@ -360,21 +361,21 @@ static struct perf_evsel *perf_evsel__raw_syscall_newtp(const char *direction, v 
	({ struct syscall_tp *fields = evsel->priv; \

	   fields->name.pointer(&fields->name, sample); })



size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, const char *intfmt, int val)

size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, const char *intfmt, bool show_prefix, int val)

{

	int idx = val - sa->offset;



	if (idx < 0 || idx >= sa->nr_entries || sa->entries[idx] == NULL)

		return scnprintf(bf, size, intfmt, val);



	return scnprintf(bf, size, "%s", sa->entries[idx]);

	return scnprintf(bf, size, "%s%s", show_prefix ? sa->prefix : "", sa->entries[idx]);

}



static size_t __syscall_arg__scnprintf_strarray(char *bf, size_t size,

						const char *intfmt,

					        struct syscall_arg *arg)

{

	return strarray__scnprintf(arg->parm, bf, size, intfmt, arg->val);

	return strarray__scnprintf(arg->parm, bf, size, intfmt, arg->show_string_prefix, arg->val);

}



static size_t syscall_arg__scnprintf_strarray(char *bf, size_t size,
@@ -408,7 +409,7 @@ size_t syscall_arg__scnprintf_strarrays(char *bf, size_t size, 
		if (idx >= 0 && idx < sa->nr_entries) {

			if (sa->entries[idx] == NULL)

				break;

			return scnprintf(bf, size, "%s", sa->entries[idx]);

			return scnprintf(bf, size, "%s%s", arg->show_string_prefix ? sa->prefix : "", sa->entries[idx]);

		}

	}
@@ -423,10 +424,10 @@ static size_t syscall_arg__scnprintf_fd_at(char *bf, size_t size, 
					   struct syscall_arg *arg)

{

	int fd = arg->val;

	/* char fd_at_prefix = "AT_FD"; */

	const char *prefix = "AT_FD";



	if (fd == AT_FDCWD)

		return scnprintf(bf, size, "CWD");

		return scnprintf(bf, size, "%s%s", arg->show_string_prefix ? prefix : "", "CWD");



	return syscall_arg__scnprintf_fd(bf, size, arg);

}
@@ -527,14 +528,16 @@ static DEFINE_STRARRAY(clockid, "CLOCK_"); 
static size_t syscall_arg__scnprintf_access_mode(char *bf, size_t size,

						 struct syscall_arg *arg)

{

	bool show_prefix = arg->show_string_prefix;

	const char *suffix = "_OK";

	size_t printed = 0;

	int mode = arg->val;



	if (mode == F_OK) /* 0 */

		return scnprintf(bf, size, "F");

		return scnprintf(bf, size, "F%s", show_prefix ? suffix : "");

#define	P_MODE(n) \

	if (mode & n##_OK) { \

		printed += scnprintf(bf + printed, size - printed, "%s", #n); \

		printed += scnprintf(bf + printed, size - printed, "%s%s", #n, show_prefix ? suffix : ""); \

		mode &= ~n##_OK; \

	}
@@ -559,11 +562,13 @@ static size_t syscall_arg__scnprintf_filename(char *bf, size_t size, 
static size_t syscall_arg__scnprintf_pipe_flags(char *bf, size_t size,

						struct syscall_arg *arg)

{

	bool show_prefix = arg->show_string_prefix;

	const char *prefix = "O_";

	int printed = 0, flags = arg->val;



#define	P_FLAG(n) \

	if (flags & O_##n) { \

		printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \

		printed += scnprintf(bf + printed, size - printed, "%s%s%s", printed ? "|" : "", show_prefix ? prefix : "", #n); \

		flags &= ~O_##n; \

	}
@@ -589,11 +594,13 @@ static size_t syscall_arg__scnprintf_pipe_flags(char *bf, size_t size, 
static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size,

						   struct syscall_arg *arg)

{

	bool show_prefix = arg->show_string_prefix;

	const char *prefix = "GRND_";

	int printed = 0, flags = arg->val;



#define	P_FLAG(n) \

	if (flags & GRND_##n) { \

		printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \

		printed += scnprintf(bf + printed, size - printed, "%s%s%s", printed ? "|" : "", show_prefix ? prefix : "", #n); \

		flags &= ~GRND_##n; \

	}
@@ -1577,6 +1584,7 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size, 
		.mask	= 0,

		.trace  = trace,

		.thread = thread,

		.show_string_prefix = trace->show_string_prefix,

	};

	struct thread_trace *ttrace = thread__priv(thread);
@@ -3563,6 +3571,8 @@ static int trace__config(const char *var, const char *value, void *arg) 
			goto out;

		}

		trace->show_zeros = new_show_zeros;

	} else if (!strcmp(var, "trace.show_prefix")) {

		trace->show_string_prefix = perf_config_bool(var, value);

	} else if (!strcmp(var, "trace.no_inherit")) {

		trace->opts.no_inherit = perf_config_bool(var, value);

	} else if (!strcmp(var, "trace.args_alignment")) {

tools/perf/trace/beauty/beauty.h

+5 −3
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ struct strarray { 
	.prefix = _prefix, \

}



size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, const char *intfmt, int val);

size_t strarray__scnprintf_flags(struct strarray *sa, char *bf, size_t size, unsigned long flags);

size_t strarray__scnprintf(struct strarray *sa, char *bf, size_t size, const char *intfmt, bool show_prefix, int val);

size_t strarray__scnprintf_flags(struct strarray *sa, char *bf, size_t size, bool show_prefix, unsigned long flags);



struct trace;

struct thread;
@@ -69,6 +69,7 @@ struct augmented_arg { 
 * @parm: private area, may be an strarray, for instance

 * @idx: syscall arg idx (is this the first?)

 * @mask: a syscall arg may mask another arg, see syscall_arg__scnprintf_futex_op

 * @show_string_prefix: When there is a common prefix in a string table, show it or not

 */



struct syscall_arg {
@@ -83,6 +84,7 @@ struct syscall_arg { 
	void	      *parm;

	u8	      idx;

	u8	      mask;

	bool	      show_string_prefix;

};



unsigned long syscall_arg__val(struct syscall_arg *arg, u8 idx);
@@ -162,7 +164,7 @@ size_t syscall_arg__scnprintf_statx_flags(char *bf, size_t size, struct syscall_ 
size_t syscall_arg__scnprintf_statx_mask(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_STATX_MASK syscall_arg__scnprintf_statx_mask



size_t open__scnprintf_flags(unsigned long flags, char *bf, size_t size);

size_t open__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix);



void syscall_arg__set_ret_scnprintf(struct syscall_arg *arg,

				    size_t (*ret_scnprintf)(char *bf, size_t size, struct syscall_arg *arg));

tools/perf/trace/beauty/clone.c

+4 −3
Original line number Diff line number Diff line
@@ -10,13 +10,14 @@ 
#include <sys/types.h>

#include <uapi/linux/sched.h>



static size_t clone__scnprintf_flags(unsigned long flags, char *bf, size_t size)

static size_t clone__scnprintf_flags(unsigned long flags, char *bf, size_t size, bool show_prefix)

{

	const char *prefix = "CLONE_";

	int printed = 0;



#define	P_FLAG(n) \

	if (flags & CLONE_##n) { \

		printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \

		printed += scnprintf(bf + printed, size - printed, "%s%s%s", printed ? "|" : "", show_prefix ? prefix : "", #n); \

		flags &= ~CLONE_##n; \

	}
@@ -70,5 +71,5 @@ size_t syscall_arg__scnprintf_clone_flags(char *bf, size_t size, struct syscall_ 
	if (!(flags & CLONE_SETTLS))

		arg->mask |= SCC_TLS;



	return clone__scnprintf_flags(flags, bf, size);

	return clone__scnprintf_flags(flags, bf, size, arg->show_string_prefix);

}

tools/perf/trace/beauty/eventfd.c

+3 −1
Original line number Diff line number Diff line
@@ -13,13 +13,15 @@ 


static size_t syscall_arg__scnprintf_eventfd_flags(char *bf, size_t size, struct syscall_arg *arg)

{

	bool show_prefix = arg->show_string_prefix;

	const char *prefix = "EFD_";

	int printed = 0, flags = arg->val;



	if (flags == 0)

		return scnprintf(bf, size, "NONE");

#define	P_FLAG(n) \

	if (flags & EFD_##n) { \

		printed += scnprintf(bf + printed, size - printed, "%s%s", printed ? "|" : "", #n); \

		printed += scnprintf(bf + printed, size - printed, "%s%s%s", printed ? "|" : "", show_prefix ? prefix : "", #n); \

		flags &= ~EFD_##n; \

	}