Commit a3af66f5 authored Jun 25, 2018 by Ravi Bangoria Committed by Arnaldo Carvalho de Melo Jun 25, 2018

perf script: Fix crash because of missing evsel->priv



'perf script' in piped mode is crashing because evsel->priv is not set
properly. Fix it.

Before:

  # perf record -o - -- ls | perf script
  <SNIP 'ls' output>
    Segmentation fault (core dumped)
  #

After:

  # perf record -o - -- ls | perf script
  <SNIP 'ls' output>
  ls 2282 1031.731974:  250000 cpu-clock:uhH:  7effe4b3d29e
  ls 2282 1031.732222:  250000 cpu-clock:uhH:  7effe4b3a650
  #

Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: David Carrillo-Cisneros <davidcc@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Fixes: a14390fd ("perf script: Allow creating per-event dump files")
Link: http://lkml.kernel.org/r/20180625124220.6434-3-ravi.bangoria@linux.ibm.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 10e9cec9

tools/perf/builtin-script.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -1834,6 +1834,7 @@ static int process_attr(struct perf_tool tool, union perf_event event,
		struct perf_evlist *evlist;
		struct perf_evsel evsel, pos;
		int err;
		static struct perf_evsel_script *es;

		err = perf_event__process_attr(tool, event, pevlist);
		if (err)
		@@ -1842,6 +1843,19 @@ static int process_attr(struct perf_tool tool, union perf_event event,
		evlist = *pevlist;
		evsel = perf_evlist__last(*pevlist);

		if (!evsel->priv) {
		if (scr->per_event_dump) {
		evsel->priv = perf_evsel_script__new(evsel,
		scr->session->data);
		} else {
		es = zalloc(sizeof(*es));
		if (!es)
		return -ENOMEM;
		es->fp = stdout;
		evsel->priv = es;
		}
		}

		if (evsel->attr.type >= PERF_TYPE_MAX &&
		evsel->attr.type != PERF_TYPE_SYNTH)
		return 0;

Admin message