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

perf trace: Beautify renameat2's flags argument 

  # strace -e renameat2 -f perf trace -e rename* mv c /tmp
  strace: Process 10824 attached
  [pid 10824] renameat2(AT_FDCWD, "c", AT_FDCWD, "/tmp", RENAME_NOREPLACE) = -1 EXDEV (Invalid cross-device link)
  [pid 10824] renameat2(AT_FDCWD, "c", AT_FDCWD, "/tmp/c", RENAME_NOREPLACE) = -1 EEXIST (File exists)
       1.857 ( 0.008 ms): mv/10824 renameat2(olddfd: CWD, oldname: 0x7ffc72ff3d81, newdfd: CWD, newname: 0x7ffc72ff3d83, flags: NOREPLACE) = -1 EXDEV Invalid cross-device link
       2.002 ( 0.006 ms): mv/10824 renameat2(olddfd: CWD, oldname: 0x7ffc72ff3d81, newdfd: CWD, newname: 0x55ad609efcc0, flags: NOREPLACE) = -1 EEXIST File exists
  mv: 'c' and '/tmp/c' are the same file
  [pid 10824] +++ exited with 1 +++
  --- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=10824, si_uid=0, si_status=1, si_utime=0, si_stime=0} ---
  +++ exited with 0 +++
  #

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-glyt6nzlt1yx56m5bshy6g83@git.kernel.org


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

tools/perf/builtin-trace.c

+2 −1
Original line number Diff line number Diff line
@@ -801,7 +801,8 @@ static struct syscall_fmt { 
	  .arg = { [0] = { .scnprintf = SCA_FDAT, /* dfd */ }, }, },

	{ .name	    = "renameat2",

	  .arg = { [0] = { .scnprintf = SCA_FDAT, /* olddirfd */ },

		   [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ }, }, },

		   [2] = { .scnprintf = SCA_FDAT, /* newdirfd */ },

		   [4] = { .scnprintf = SCA_RENAMEAT2_FLAGS, /* flags */ }, }, },

	{ .name	    = "rt_sigaction",

	  .arg = { [0] = { .scnprintf = SCA_SIGNUM, /* sig */ }, }, },

	{ .name	    = "rt_sigprocmask",

tools/perf/trace/beauty/Build

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ libperf-y += kcmp.o 
libperf-y += mount_flags.o

libperf-y += pkey_alloc.o

libperf-y += prctl.o

libperf-y += renameat.o

libperf-y += sockaddr.o

libperf-y += socket.o

libperf-y += statx.o

tools/perf/trace/beauty/beauty.h

+3 −0
Original line number Diff line number Diff line
@@ -144,6 +144,9 @@ size_t syscall_arg__scnprintf_prctl_arg2(char *bf, size_t size, struct syscall_a 
size_t syscall_arg__scnprintf_prctl_arg3(char *bf, size_t size, struct syscall_arg *arg);

#define SCA_PRCTL_ARG3 syscall_arg__scnprintf_prctl_arg3



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

#define SCA_RENAMEAT2_FLAGS syscall_arg__scnprintf_renameat2_flags



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

#define SCA_SOCKADDR syscall_arg__scnprintf_sockaddr

tools/perf/trace/beauty/renameat.c

0 → 100644
+19 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: LGPL-2.1

// Copyright (C) 2018, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>



#include "trace/beauty/beauty.h"

#include <uapi/linux/fs.h>



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

{

#include "trace/beauty/generated/rename_flags_array.c"

       static DEFINE_STRARRAY(rename_flags);



       return strarray__scnprintf_flags(&strarray__rename_flags, bf, size, flags);

}



size_t syscall_arg__scnprintf_renameat2_flags(char *bf, size_t size, struct syscall_arg *arg)

{

	unsigned long flags = arg->val;

	return renameat2__scnprintf_flags(flags, bf, size);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE