Commit f8304a93 authored Sep 30, 2019 by Arnaldo Carvalho de Melo Committed by Greg Kroah-Hartman Nov 06, 2019

perf annotate: Propagate the symbol__annotate() error return



[ Upstream commit 211f493b611eef012841f795166c38ec7528738d ]

We were just returning -1 in symbol__annotate() when symbol__annotate()
failed, propagate its error as it is used later to pass to
symbol__strerror_disassemble() to present a error message to the user,
that in some cases were getting:

  "Invalid -1 error code"

Fix it to propagate the error.

Reported-by: Russell King - ARM Linux admin <linux@armlinux.org.uk>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Cc: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/n/tip-0tj89rs9g7nbcyd5skadlvuu@git.kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 4e2ca0c9

tools/perf/util/annotate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2757,7 +2757,7 @@ int symbol__annotate2(struct symbol sym, struct map map, struct perf_evsel *ev

		out_free_offsets:
		zfree(&notes->offsets);
		return -1;
		return err;
		}

		#define ANNOTATION__CFG(n) \