diff options
author | Song Liu <songliubraving@fb.com> | 2019-06-20 21:44:38 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-07-09 09:13:28 -0400 |
commit | 9d49169c5958e429ffa6874fbef734ae7502ad65 (patch) | |
tree | ddc6937b240288914985a4d0afc66f00770fc614 /tools/perf/builtin-script.c | |
parent | 1334bb94cd8a21217cb0c186925f9bc9d47adafc (diff) |
perf script: Assume native_arch for pipe mode
In pipe mode, session->header.env.arch is not populated until the events
are processed. Therefore, the following command crashes:
perf record -o - | perf script
(gdb) bt
It fails when we try to compare env.arch against uts.machine:
if (!strcmp(uts.machine, session->header.env.arch) ||
(!strcmp(uts.machine, "x86_64") &&
!strcmp(session->header.env.arch, "i386")))
native_arch = true;
In pipe mode, it is tricky to find env.arch at this stage. To keep it
simple, let's just assume native_arch is always true for pipe mode.
Reported-by: David Carrillo Cisneros <davidca@fb.com>
Signed-off-by: Song Liu <songliubraving@fb.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: kernel-team@fb.com
Cc: stable@vger.kernel.org #v5.1+
Fixes: 3ab481a1cfe1 ("perf script: Support insn output for normal samples")
Link: http://lkml.kernel.org/r/20190621014438.810342-1-songliubraving@fb.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-script.c')
-rw-r--r-- | tools/perf/builtin-script.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index b3536820f9a8..79367087bd18 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c | |||
@@ -3752,7 +3752,8 @@ int cmd_script(int argc, const char **argv) | |||
3752 | goto out_delete; | 3752 | goto out_delete; |
3753 | 3753 | ||
3754 | uname(&uts); | 3754 | uname(&uts); |
3755 | if (!strcmp(uts.machine, session->header.env.arch) || | 3755 | if (data.is_pipe || /* assume pipe_mode indicates native_arch */ |
3756 | !strcmp(uts.machine, session->header.env.arch) || | ||
3756 | (!strcmp(uts.machine, "x86_64") && | 3757 | (!strcmp(uts.machine, "x86_64") && |
3757 | !strcmp(session->header.env.arch, "i386"))) | 3758 | !strcmp(session->header.env.arch, "i386"))) |
3758 | native_arch = true; | 3759 | native_arch = true; |