Commit 92ead7ee authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Arnaldo Carvalho de Melo

perf tools: Fix crash caused by accessing feat_ops[HEADER_LAST_FEATURE]

perf_event__process_feature() accesses feat_ops[HEADER_LAST_FEATURE]
which is not defined and thus perf is crashing. HEADER_LAST_FEATURE is
used as an end marker for the perf report but it's unused for perf
script/annotate. Ignore HEADER_LAST_FEATURE for perf script/annotate,
just like it is done in 'perf report'.

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

After:
  # perf record -o - ls | perf script
  <SNIP 'ls' output>
  Segmentation fault (core dumped)
  ls 7031 4392.099856:  250000 cpu-clock:uhH:  7f5e0ce7cd60
  ls 7031 4392.100355:  250000 cpu-clock:uhH:  7f5e0c706ef7
  #
Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.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: 57b5de46 ("perf report: Support forced leader feature in pipe mode")
Link: http://lkml.kernel.org/r/20180625124220.6434-4-ravi.bangoria@linux.ibm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a3af66f5
...@@ -283,6 +283,15 @@ static int process_sample_event(struct perf_tool *tool, ...@@ -283,6 +283,15 @@ static int process_sample_event(struct perf_tool *tool,
return ret; return ret;
} }
static int process_feature_event(struct perf_tool *tool,
union perf_event *event,
struct perf_session *session)
{
if (event->feat.feat_id < HEADER_LAST_FEATURE)
return perf_event__process_feature(tool, event, session);
return 0;
}
static int hist_entry__tty_annotate(struct hist_entry *he, static int hist_entry__tty_annotate(struct hist_entry *he,
struct perf_evsel *evsel, struct perf_evsel *evsel,
struct perf_annotate *ann) struct perf_annotate *ann)
...@@ -471,7 +480,7 @@ int cmd_annotate(int argc, const char **argv) ...@@ -471,7 +480,7 @@ int cmd_annotate(int argc, const char **argv)
.attr = perf_event__process_attr, .attr = perf_event__process_attr,
.build_id = perf_event__process_build_id, .build_id = perf_event__process_build_id,
.tracing_data = perf_event__process_tracing_data, .tracing_data = perf_event__process_tracing_data,
.feature = perf_event__process_feature, .feature = process_feature_event,
.ordered_events = true, .ordered_events = true,
.ordering_requires_timestamps = true, .ordering_requires_timestamps = true,
}, },
......
...@@ -217,7 +217,8 @@ static int process_feature_event(struct perf_tool *tool, ...@@ -217,7 +217,8 @@ static int process_feature_event(struct perf_tool *tool,
} }
/* /*
* All features are received, we can force the * (feat_id = HEADER_LAST_FEATURE) is the end marker which
* means all features are received, now we can force the
* group if needed. * group if needed.
*/ */
setup_forced_leader(rep, session->evlist); setup_forced_leader(rep, session->evlist);
......
...@@ -3044,6 +3044,15 @@ int process_cpu_map_event(struct perf_tool *tool __maybe_unused, ...@@ -3044,6 +3044,15 @@ int process_cpu_map_event(struct perf_tool *tool __maybe_unused,
return set_maps(script); return set_maps(script);
} }
static int process_feature_event(struct perf_tool *tool,
union perf_event *event,
struct perf_session *session)
{
if (event->feat.feat_id < HEADER_LAST_FEATURE)
return perf_event__process_feature(tool, event, session);
return 0;
}
#ifdef HAVE_AUXTRACE_SUPPORT #ifdef HAVE_AUXTRACE_SUPPORT
static int perf_script__process_auxtrace_info(struct perf_tool *tool, static int perf_script__process_auxtrace_info(struct perf_tool *tool,
union perf_event *event, union perf_event *event,
...@@ -3088,7 +3097,7 @@ int cmd_script(int argc, const char **argv) ...@@ -3088,7 +3097,7 @@ int cmd_script(int argc, const char **argv)
.attr = process_attr, .attr = process_attr,
.event_update = perf_event__process_event_update, .event_update = perf_event__process_event_update,
.tracing_data = perf_event__process_tracing_data, .tracing_data = perf_event__process_tracing_data,
.feature = perf_event__process_feature, .feature = process_feature_event,
.build_id = perf_event__process_build_id, .build_id = perf_event__process_build_id,
.id_index = perf_event__process_id_index, .id_index = perf_event__process_id_index,
.auxtrace_info = perf_script__process_auxtrace_info, .auxtrace_info = perf_script__process_auxtrace_info,
......
...@@ -3464,7 +3464,7 @@ int perf_event__process_feature(struct perf_tool *tool, ...@@ -3464,7 +3464,7 @@ int perf_event__process_feature(struct perf_tool *tool,
pr_warning("invalid record type %d in pipe-mode\n", type); pr_warning("invalid record type %d in pipe-mode\n", type);
return 0; return 0;
} }
if (feat == HEADER_RESERVED || feat > HEADER_LAST_FEATURE) { if (feat == HEADER_RESERVED || feat >= HEADER_LAST_FEATURE) {
pr_warning("invalid record type %d in pipe-mode\n", type); pr_warning("invalid record type %d in pipe-mode\n", type);
return -1; return -1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment