perf trace beauty: Mask ignored fcntl 'arg' parameter

A series of fcntl cmds ignore the third argument, so mask it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-6vtl3zq1tauamrhm8o380ptn@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index ef1b1d4ea00783b4fdd60362f1edaa4149cfc5d2..b7f79dea3c443b1fe368d0c907be03f8bbf1d145 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -661,7 +661,7 @@ static struct syscall_fmt {
        { .name     = "fchownat",   .errmsg = true,
          .arg_scnprintf = { [0] = SCA_FDAT, /* fd */ }, },
        { .name     = "fcntl",      .errmsg = true,
-         .arg_scnprintf = { [1] = SCA_STRARRAYS, /* cmd */ },
+         .arg_scnprintf = { [1] = SCA_FCNTL_CMD, /* cmd */ },
          .arg_parm      = { [1] = &strarrays__fcntl_cmds_arrays, /* cmd */ }, },
        { .name     = "fdatasync",  .errmsg = true, },
        { .name     = "flock",      .errmsg = true,

diff --git a/tools/perf/trace/beauty/Build b/tools/perf/trace/beauty/Build
index be95ac6ce84595817ddc267bc7cc77b434c26e81..c9e215b806f197766a64a27d8e5e347ba5b21a7b 100644 (file)
--- a/tools/perf/trace/beauty/Build
+++ b/tools/perf/trace/beauty/Build
@@ -1 +1,2 @@
+libperf-y += fcntl.o
 libperf-y += statx.o

diff --git a/tools/perf/trace/beauty/beauty.h b/tools/perf/trace/beauty/beauty.h
index a6348073a6e9e26a045ca3ea20832c6ccafd74e4..ce01079d8422594bc421d60ff6224e0b0e18dff4 100644 (file)
--- a/tools/perf/trace/beauty/beauty.h
+++ b/tools/perf/trace/beauty/beauty.h
@@ -18,6 +18,9 @@ struct syscall_arg {
 size_t syscall_arg__scnprintf_strarrays(char *bf, size_t size, struct syscall_arg *arg);
 #define SCA_STRARRAYS syscall_arg__scnprintf_strarrays
 
+size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_arg *arg);
+#define SCA_FCNTL_CMD syscall_arg__scnprintf_fcntl_cmd
+
 size_t syscall_arg__scnprintf_statx_flags(char *bf, size_t size, struct syscall_arg *arg);
 #define SCA_STATX_FLAGS syscall_arg__scnprintf_statx_flags
 

diff --git a/tools/perf/trace/beauty/fcntl.c b/tools/perf/trace/beauty/fcntl.c
new file mode 100644 (file)
index 0000000..7e4582c
--- /dev/null
+++ b/tools/perf/trace/beauty/fcntl.c
@@ -0,0 +1,23 @@
+/*
+ * trace/beauty/fcntl.c
+ *
+ *  Copyright (C) 2017, Red Hat Inc, Arnaldo Carvalho de Melo <acme@redhat.com>
+ *
+ * Released under the GPL v2. (and only v2, not any later version)
+ */
+
+#include "trace/beauty/beauty.h"
+#include <uapi/linux/fcntl.h>
+
+size_t syscall_arg__scnprintf_fcntl_cmd(char *bf, size_t size, struct syscall_arg *arg)
+{
+       /*
+        * Some commands ignore the third fcntl argument, "arg", so mask it
+        */
+       if (arg->val == F_GETFD    || arg->val == F_GETFL     ||
+           arg->val == F_GETOWN   || arg->val == F_GET_SEALS ||
+           arg->val == F_GETLEASE || arg->val == F_GETSIG)
+               arg->mask |= (1 << 2);
+
+       return syscall_arg__scnprintf_strarrays(bf, size, arg);
+}