OSDN Git Service

perf trace: Fixup etcsnoop example
authorArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 24 Jan 2019 14:39:15 +0000 (15:39 +0100)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 25 Jan 2019 14:12:11 +0000 (15:12 +0100)
Where we don't have "raw_syscalls:sys_enter", so we need to look for a
"*syscalls:sys_enter*" to initialize the offsets for the
__augmented_syscalls__ evsel, which is the case with etcsnoop, that was
segfaulting, fixed:

  # trace -e /home/acme/git/perf/tools/perf/examples/bpf/etcsnoop.c
     0.000 (         ): gnome-shell/2105 openat(dfd: CWD, filename: "/etc/localtime")                       ...
   631.834 (         ): cat/6521 openat(dfd: CWD, filename: "/etc/ld.so.cache", flags: RDONLY|CLOEXEC) ...
   632.637 (         ): bash/6521 openat(dfd: CWD, filename: "/etc/passwd")                          ...
  ^C#

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>
Fixes: b9b6a2ea2baf ("perf trace: Do not hardcode the size of the tracepoint common_ fields")
Link: https://lkml.kernel.org/n/tip-0tjwcit8qitsmh4nyvf2b0jo@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-trace.c

index ed45831..1447993 100644 (file)
@@ -3854,7 +3854,8 @@ int cmd_trace(int argc, const char **argv)
                                goto init_augmented_syscall_tp;
                        }
 
-                       if (strcmp(perf_evsel__name(evsel), "raw_syscalls:sys_enter") == 0) {
+                       if (trace.syscalls.events.augmented->priv == NULL &&
+                           strstr(perf_evsel__name(evsel), "syscalls:sys_enter")) {
                                struct perf_evsel *augmented = trace.syscalls.events.augmented;
                                if (perf_evsel__init_augmented_syscall_tp(augmented, evsel) ||
                                    perf_evsel__init_augmented_syscall_tp_args(augmented))