Commit-ID:  edee44be59190bf22d5c6e521f3852b7ff16862f
Gitweb:     http://git.kernel.org/tip/edee44be59190bf22d5c6e521f3852b7ff16862f
Author:     Ravi Bangoria <ravi.bango...@linux.vnet.ibm.com>
AuthorDate: Tue, 22 Nov 2016 14:10:50 +0530
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Tue, 20 Dec 2016 12:00:32 -0300

perf annotate: Don't throw error for zero length symbols

'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 <an...@samba.org>
Link: https://lkml.org/lkml/2016/10/8/189
Signed-off-by: Ravi Bangoria <ravi.bango...@linux.vnet.ibm.com>
Cc: Alexander Shishkin <alexander.shish...@linux.intel.com>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Chris Riyder <chris.ry...@arm.com>
Cc: linuxppc-...@lists.ozlabs.org
Cc: Masami Hiramatsu <mhira...@kernel.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Nicholas Piggin <npig...@gmail.com>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: sta...@kernel.org # v4.9+
Link: 
http://lkml.kernel.org/r/1479804050-5028-1-git-send-email-ravi.bango...@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/util/annotate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index c81a395..06cc04e 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -647,7 +647,8 @@ static int __symbol__inc_addr_samples(struct symbol *sym, 
struct map *map,
 
        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;

Reply via email to