[PATCH 4.9 005/116] perf annotate: Dont throw error for zero length symbols

Greg Kroah-Hartman gregkh at linuxfoundation.org
Sat Jan 7 08:42:47 AEDT 2017

4.9-stable review patch.  If anyone has any objections, please let me know.


From: Ravi Bangoria <ravi.bangoria at linux.vnet.ibm.com>

commit edee44be59190bf22d5c6e521f3852b7ff16862f upstream.

'perf report --tui' exits with error when it finds a sample of zero
length symbol (i.e. addr == sym->start == sym->end). Actually these are
valid samples. Don't exit TUI and show report with such symbols.

Reported-and-Tested-by: Anton Blanchard <anton at samba.org>
Link: https://lkml.org/lkml/2016/10/8/189
Signed-off-by: Ravi Bangoria <ravi.bangoria at linux.vnet.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin at linux.intel.com>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Cc: Chris Riyder <chris.ryder at arm.com>
Cc: linuxppc-dev at lists.ozlabs.org
Cc: Masami Hiramatsu <mhiramat at kernel.org>
Cc: Michael Ellerman <mpe at ellerman.id.au>
Cc: Nicholas Piggin <npiggin at gmail.com>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Peter Zijlstra <peterz at infradead.org>
Link: http://lkml.kernel.org/r/1479804050-5028-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

 tools/perf/util/annotate.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -593,7 +593,8 @@ static int __symbol__inc_addr_samples(st
 	pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr));
-	if (addr < sym->start || addr >= sym->end) {
+	if ((addr < sym->start || addr >= sym->end) &&
+	    (addr != sym->end || sym->start != sym->end)) {
 		pr_debug("%s(%d): ERANGE! sym->name=%s, start=%#" PRIx64 ", addr=%#" PRIx64 ", end=%#" PRIx64 "\n",
 		       __func__, __LINE__, sym->name, sym->start, addr, sym->end);
 		return -ERANGE;

More information about the Linuxppc-dev mailing list