Commit a7eec4c6 authored Nov 15, 2017 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Nov 17, 2017

perf top: Fix crash when annotating symbol

Ravi reported crash in perf top --stdio when annotating a function [1].
The issue was, that we don't pass evsel pointer into symbol__annotate()
function, which got over looked in the last annotation changes.

[1] https://marc.info/?l=linux-kernel&m=151060884412702&w=2



Committer note:

This fixes the crash, but makes it stumble into another bug, double
locking the annotation data structures, that is in turn fixed by the
next patch in this series.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-6eol035redpoqvxqnuiqudtc@git.kernel.org


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

parent 244a1086

tools/perf/builtin-top.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ static void perf_top__resize(struct perf_top *top)

		static int perf_top__parse_source(struct perf_top top, struct hist_entry he)
		{
		struct perf_evsel *evsel = hists_to_evsel(he->hists);
		struct symbol *sym;
		struct annotation *notes;
		struct map *map;
		@@ -137,7 +138,7 @@ static int perf_top__parse_source(struct perf_top top, struct hist_entry he)
		return err;
		}

		err = symbol__annotate(sym, map, NULL, 0, NULL, NULL);
		err = symbol__annotate(sym, map, evsel, 0, NULL, NULL);
		if (err == 0) {
		out_assign:
		top->sym_filter_entry = he;

Admin message