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

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

perf trace: Tell arg formatters the arg index 

... so that it can mask args relative to its position, like the 'mode' arg
that may or not be printed according to the 'flags' (O_CREAT) value.

 [root@zoo ~]# perf trace -a -e openat,open_by_handle_at | head -1
    469.754 ( 0.034 ms): 1183 openat(dfd: -100, filename: 0x7fbde40014b0, flags: CLOEXEC|DIRECTORY|NONBLOCK) = 23
 [root@zoo ~]#

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-bgokqpkufd4sio7ixxknf1ux@git.kernel.org


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

tools/perf/builtin-trace.c

+25 −11
Original line number Original line Diff line number Diff line
@@ -17,7 +17,9 @@ 
#include <linux/futex.h>

#include <linux/futex.h>





static size_t syscall_arg__scnprintf_hex(char *bf, size_t size,

static size_t syscall_arg__scnprintf_hex(char *bf, size_t size,

					 unsigned long arg, u8 *arg_mask __maybe_unused)

					 unsigned long arg,

					 u8 arg_idx __maybe_unused,

					 u8 *arg_mask __maybe_unused)

{

{

	return scnprintf(bf, size, "%#lx", arg);

	return scnprintf(bf, size, "%#lx", arg);

}

}
@@ -25,7 +27,9 @@ static size_t syscall_arg__scnprintf_hex(char *bf, size_t size, 
#define SCA_HEX syscall_arg__scnprintf_hex

#define SCA_HEX syscall_arg__scnprintf_hex





static size_t syscall_arg__scnprintf_whence(char *bf, size_t size,

static size_t syscall_arg__scnprintf_whence(char *bf, size_t size,

					    unsigned long arg, u8 *arg_mask __maybe_unused)

					    unsigned long arg,

					    u8 arg_idx __maybe_unused,

					    u8 *arg_mask __maybe_unused)

{

{

	int whence = arg;

	int whence = arg;
@@ -50,7 +54,9 @@ static size_t syscall_arg__scnprintf_whence(char *bf, size_t size, 
#define SCA_WHENCE syscall_arg__scnprintf_whence

#define SCA_WHENCE syscall_arg__scnprintf_whence





static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size,

static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size,

					       unsigned long arg, u8 *arg_mask __maybe_unused)

					       unsigned long arg,

					       u8 arg_idx __maybe_unused,

					       u8 *arg_mask __maybe_unused)

{

{

	int printed = 0, prot = arg;

	int printed = 0, prot = arg;
@@ -81,7 +87,8 @@ static size_t syscall_arg__scnprintf_mmap_prot(char *bf, size_t size, 
#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot

#define SCA_MMAP_PROT syscall_arg__scnprintf_mmap_prot





static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,

static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size,

						unsigned long arg, u8 *arg_mask __maybe_unused)

						unsigned long arg, u8 arg_idx __maybe_unused,

						u8 *arg_mask __maybe_unused)

{

{

	int printed = 0, flags = arg;

	int printed = 0, flags = arg;
@@ -122,7 +129,8 @@ static size_t syscall_arg__scnprintf_mmap_flags(char *bf, size_t size, 
#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags

#define SCA_MMAP_FLAGS syscall_arg__scnprintf_mmap_flags





static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size,

static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size,

						      unsigned long arg, u8 *arg_mask __maybe_unused)

						      unsigned long arg, u8 arg_idx __maybe_unused,

						      u8 *arg_mask __maybe_unused)

{

{

	int behavior = arg;

	int behavior = arg;
@@ -163,7 +171,8 @@ static size_t syscall_arg__scnprintf_madvise_behavior(char *bf, size_t size, 




#define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior

#define SCA_MADV_BHV syscall_arg__scnprintf_madvise_behavior





static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, unsigned long arg, u8 *arg_mask)

static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, unsigned long arg,

					      u8 arg_idx __maybe_unused, u8 *arg_mask)

{

{

	enum syscall_futex_args {

	enum syscall_futex_args {

		SCF_UADDR   = (1 << 0),

		SCF_UADDR   = (1 << 0),
@@ -207,12 +216,13 @@ static size_t syscall_arg__scnprintf_futex_op(char *bf, size_t size, unsigned lo 
#define SCA_FUTEX_OP  syscall_arg__scnprintf_futex_op

#define SCA_FUTEX_OP  syscall_arg__scnprintf_futex_op





static size_t syscall_arg__scnprintf_open_flags(char *bf, size_t size,

static size_t syscall_arg__scnprintf_open_flags(char *bf, size_t size,

					       unsigned long arg, u8 *arg_mask)

					       unsigned long arg,

					       u8 arg_idx, u8 *arg_mask)

{

{

	int printed = 0, flags = arg;

	int printed = 0, flags = arg;





	if (!(flags & O_CREAT))

	if (!(flags & O_CREAT))

		*arg_mask |= 1 << 2; /* Mask the mode parm */

		*arg_mask |= 1 << (arg_idx + 1); /* Mask the mode parm */





	if (flags == 0)

	if (flags == 0)

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

		return scnprintf(bf, size, "RDONLY");
@@ -265,7 +275,7 @@ static size_t syscall_arg__scnprintf_open_flags(char *bf, size_t size, 
static struct syscall_fmt {

static struct syscall_fmt {

	const char *name;

	const char *name;

	const char *alias;

	const char *alias;

	size_t	   (*arg_scnprintf[6])(char *bf, size_t size, unsigned long arg, u8 *arg_mask);

	size_t	   (*arg_scnprintf[6])(char *bf, size_t size, unsigned long arg, u8 arg_idx, u8 *arg_mask);

	bool	   errmsg;

	bool	   errmsg;

	bool	   timeout;

	bool	   timeout;

	bool	   hexret;

	bool	   hexret;
@@ -302,6 +312,10 @@ static struct syscall_fmt { 
	  .arg_scnprintf = { [0] = SCA_HEX, /* addr */ }, },

	  .arg_scnprintf = { [0] = SCA_HEX, /* addr */ }, },

	{ .name	    = "open",	    .errmsg = true,

	{ .name	    = "open",	    .errmsg = true,

	  .arg_scnprintf = { [1] = SCA_OPEN_FLAGS, /* flags */ }, },

	  .arg_scnprintf = { [1] = SCA_OPEN_FLAGS, /* flags */ }, },

	{ .name	    = "open_by_handle_at", .errmsg = true,

	  .arg_scnprintf = { [2] = SCA_OPEN_FLAGS, /* flags */ }, },

	{ .name	    = "openat",	    .errmsg = true,

	  .arg_scnprintf = { [2] = SCA_OPEN_FLAGS, /* flags */ }, },

	{ .name	    = "poll",	    .errmsg = true, .timeout = true, },

	{ .name	    = "poll",	    .errmsg = true, .timeout = true, },

	{ .name	    = "ppoll",	    .errmsg = true, .timeout = true, },

	{ .name	    = "ppoll",	    .errmsg = true, .timeout = true, },

	{ .name	    = "pread",	    .errmsg = true, .alias = "pread64", },

	{ .name	    = "pread",	    .errmsg = true, .alias = "pread64", },
@@ -332,7 +346,7 @@ struct syscall { 
	bool		    filtered;

	bool		    filtered;

	struct syscall_fmt  *fmt;

	struct syscall_fmt  *fmt;

	size_t		    (**arg_scnprintf)(char *bf, size_t size,

	size_t		    (**arg_scnprintf)(char *bf, size_t size,

					      unsigned long arg, u8 *args_mask);

					      unsigned long arg, u8 arg_idx, u8 *args_mask);

};

};





static size_t fprintf_duration(unsigned long t, FILE *fp)

static size_t fprintf_duration(unsigned long t, FILE *fp)
@@ -589,7 +603,7 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size, 




			if (sc->arg_scnprintf && sc->arg_scnprintf[i]) {

			if (sc->arg_scnprintf && sc->arg_scnprintf[i]) {

				printed += sc->arg_scnprintf[i](bf + printed, size - printed,

				printed += sc->arg_scnprintf[i](bf + printed, size - printed,

								args[i], &mask);

								args[i], i, &mask);

			} else {

			} else {

				printed += scnprintf(bf + printed, size - printed,

				printed += scnprintf(bf + printed, size - printed,

						     "%ld", args[i]);

						     "%ld", args[i]);