perf top: Fix crash when annotating symbol

olsajiri · acmel · commit a7eec4c677fe · 2017-11-17T12:16:24.000-03:00
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>
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ static void perf_top__resize(struct perf_top *top)`
`99`	`99`
`100`	`100`	`static int perf_top__parse_source(struct perf_top top, struct hist_entry he)`
`101`	`101`	`{`
	`102`	`+ struct perf_evsel *evsel = hists_to_evsel(he->hists);`
`102`	`103`	`struct symbol *sym;`
`103`	`104`	`struct annotation *notes;`
`104`	`105`	`struct map *map;`
`@@ -137,7 +138,7 @@ static int perf_top__parse_source(struct perf_top top, struct hist_entry he)`
`137`	`138`	`return err;`
`138`	`139`	`}`
`139`	`140`
`140`		`- err = symbol__annotate(sym, map, NULL, 0, NULL, NULL);`
	`141`	`+ err = symbol__annotate(sym, map, evsel, 0, NULL, NULL);`
`141`	`142`	`if (err == 0) {`
`142`	`143`	`out_assign:`
`143`	`144`	`top->sym_filter_entry = he;`