From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755262AbcITVp4 (ORCPT ); Tue, 20 Sep 2016 17:45:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39342 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754923AbcITVpy (ORCPT ); Tue, 20 Sep 2016 17:45:54 -0400 Date: Tue, 20 Sep 2016 14:43:46 -0700 From: tip-bot for Ravi Bangoria Message-ID: Cc: markus@trippelsdorf.de, jolsa@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, rmk+kernel@arm.linux.org.uk, ravi.bangoria@linux.vnet.ibm.com, acme@redhat.com, pawel.moll@arm.com, chris.ryder@arm.com, tglx@linutronix.de, naveen.n.rao@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, mhiramat@kernel.org, namhyung@kernel.org, peterz@infradead.org, mingo@kernel.org, hemant@linux.vnet.ibm.com, mpe@ellerman.id.au, treeze.taeung@gmail.com Reply-To: jolsa@kernel.org, markus@trippelsdorf.de, linux-kernel@vger.kernel.org, hpa@zytor.com, rmk+kernel@arm.linux.org.uk, chris.ryder@arm.com, pawel.moll@arm.com, acme@redhat.com, ravi.bangoria@linux.vnet.ibm.com, naveen.n.rao@linux.vnet.ibm.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, mingo@kernel.org, peterz@infradead.org, namhyung@kernel.org, mhiramat@kernel.org, treeze.taeung@gmail.com, mpe@ellerman.id.au, hemant@linux.vnet.ibm.com In-Reply-To: <1471611578-11255-5-git-send-email-ravi.bangoria@linux.vnet.ibm.com> References: <1471611578-11255-5-git-send-email-ravi.bangoria@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Do not ignore call instruction with indirect target Git-Commit-ID: 88a7fcf961a27fbd248e3c914fc9df8327f7cdbb 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 Commit-ID: 88a7fcf961a27fbd248e3c914fc9df8327f7cdbb Gitweb: http://git.kernel.org/tip/88a7fcf961a27fbd248e3c914fc9df8327f7cdbb Author: Ravi Bangoria AuthorDate: Fri, 19 Aug 2016 18:29:35 +0530 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 20 Sep 2016 12:28:29 -0300 perf annotate: Do not ignore call instruction with indirect target Do not ignore call instruction with indirect target when its already identified as a call. This is an extension of commit e8ea1561952b ("perf annotate: Use raw form for register indirect call instructions") to generalize annotation for all instructions with indirect calls. This is needed for certain powerpc call instructions that use address in a register (such as bctrl, btarl, ...). Apart from that, when kcore is used to disassemble function, all call instructions were ignored. This patch will fix it as a side effect by not ignoring them. For example, Before (with kcore): mov %r13,%rdi callq 0xffffffff811a7e70 ^ jmpq 64 mov %gs:0x7ef41a6e(%rip),%al After (with kcore): mov %r13,%rdi > callq 0xffffffff811a7e70 ^ jmpq 64 mov %gs:0x7ef41a6e(%rip),%al Suggested-by: Michael Ellerman [Suggested about 'bctrl' instruction] Signed-off-by: Ravi Bangoria Cc: Alexander Shishkin Cc: Chris Riyder Cc: Hemant Kumar Cc: Jiri Olsa Cc: Markus Trippelsdorf Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Naveen N. Rao Cc: Pawel Moll Cc: Peter Zijlstra Cc: Russell King Cc: Taeung Song Link: http://lkml.kernel.org/r/1471611578-11255-5-git-send-email-ravi.bangoria@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 7a80c73..60e915f 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -82,16 +82,12 @@ static int call__parse(struct ins_operands *ops) return ops->target.name == NULL ? -1 : 0; indirect_call: - tok = strchr(endptr, '('); - if (tok != NULL) { + tok = strchr(endptr, '*'); + if (tok == NULL) { ops->target.addr = 0; return 0; } - tok = strchr(endptr, '*'); - if (tok == NULL) - return -1; - ops->target.addr = strtoull(tok + 1, NULL, 16); return 0; }