Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759707AbcLTUbg (ORCPT ); Tue, 20 Dec 2016 15:31:36 -0500 Received: from terminus.zytor.com ([198.137.202.10]:38116 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751862AbcLTUbe (ORCPT ); Tue, 20 Dec 2016 15:31:34 -0500 Date: Tue, 20 Dec 2016 11:30:10 -0800 From: tip-bot for Ravi Bangoria Message-ID: Cc: paulus@samba.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, ravi.bangoria@linux.vnet.ibm.com, hpa@zytor.com, benh@kernel.crashing.org, mhiramat@kernel.org, npiggin@gmail.com, acme@redhat.com, mpe@ellerman.id.au, anton@samba.org, chris.ryder@arm.com, mingo@kernel.org Reply-To: hpa@zytor.com, ravi.bangoria@linux.vnet.ibm.com, mhiramat@kernel.org, benh@kernel.crashing.org, paulus@samba.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org, acme@redhat.com, npiggin@gmail.com, chris.ryder@arm.com, anton@samba.org, mpe@ellerman.id.au In-Reply-To: <1479804050-5028-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com> References: <1479804050-5028-1-git-send-email-ravi.bangoria@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate: Don't throw error for zero length symbols Git-Commit-ID: edee44be59190bf22d5c6e521f3852b7ff16862f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2113 Lines: 46 Commit-ID: edee44be59190bf22d5c6e521f3852b7ff16862f Gitweb: http://git.kernel.org/tip/edee44be59190bf22d5c6e521f3852b7ff16862f Author: Ravi Bangoria AuthorDate: Tue, 22 Nov 2016 14:10:50 +0530 Committer: Arnaldo Carvalho de Melo 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 Link: https://lkml.org/lkml/2016/10/8/189 Signed-off-by: Ravi Bangoria Cc: Alexander Shishkin Cc: Benjamin Herrenschmidt Cc: Chris Riyder Cc: linuxppc-dev@lists.ozlabs.org Cc: Masami Hiramatsu Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Paul Mackerras Cc: Peter Zijlstra Cc: stable@kernel.org # v4.9+ 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 --- 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;