From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751986AbdJESRX (ORCPT ); Thu, 5 Oct 2017 14:17:23 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40761 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751350AbdJESRV (ORCPT ); Thu, 5 Oct 2017 14:17:21 -0400 Date: Thu, 5 Oct 2017 11:12:47 -0700 From: tip-bot for Ravi Bangoria Message-ID: Cc: mingo@kernel.org, yao.jin@linux.intel.com, namhyung@kernel.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, acme@redhat.com, pozdneyev@gmail.com, ak@linux.intel.com, hpa@zytor.com, ravi.bangoria@linux.vnet.ibm.com, peterz@infradead.org, milian.wolff@kdab.com, jolsa@kernel.org, kjlx@templeofstupid.com, linux-kernel@vger.kernel.org Reply-To: namhyung@kernel.org, yao.jin@linux.intel.com, tglx@linutronix.de, mingo@kernel.org, ak@linux.intel.com, hpa@zytor.com, ravi.bangoria@linux.vnet.ibm.com, alexander.shishkin@linux.intel.com, acme@redhat.com, pozdneyev@gmail.com, milian.wolff@kdab.com, jolsa@kernel.org, peterz@infradead.org, linux-kernel@vger.kernel.org, kjlx@templeofstupid.com In-Reply-To: <20171005091234.5874-1-ravi.bangoria@linux.vnet.ibm.com> References: <20171005091234.5874-1-ravi.bangoria@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf callchain: Compare dsos (as well) for CCKEY_FUNCTION Git-Commit-ID: c1fbc0cf81f1c464f5fda322c1104d4bb1da6711 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: c1fbc0cf81f1c464f5fda322c1104d4bb1da6711 Gitweb: https://git.kernel.org/tip/c1fbc0cf81f1c464f5fda322c1104d4bb1da6711 Author: Ravi Bangoria AuthorDate: Thu, 5 Oct 2017 14:42:34 +0530 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 5 Oct 2017 10:52:54 -0300 perf callchain: Compare dsos (as well) for CCKEY_FUNCTION Two functions from different binaries can have same start address. Thus, comparing only start address in match_chain() leads to inconsistent callchains. Fix this by adding a check for dsos as well. Ex, https://www.spinics.net/lists/linux-perf-users/msg04067.html Reported-by: Alexander Pozdneev Signed-off-by: Ravi Bangoria Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: Krister Johansen Cc: Milian Wolff Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Yao Jin Cc: zhangmengting@huawei.com Link: http://lkml.kernel.org/r/20171005091234.5874-1-ravi.bangoria@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/callchain.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index be09d77..a971caf 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -685,6 +685,8 @@ static enum match_result match_chain(struct callchain_cursor_node *node, { struct symbol *sym = node->sym; u64 left, right; + struct dso *left_dso = NULL; + struct dso *right_dso = NULL; if (callchain_param.key == CCKEY_SRCLINE) { enum match_result match = match_chain_srcline(node, cnode); @@ -696,12 +698,14 @@ static enum match_result match_chain(struct callchain_cursor_node *node, if (cnode->ms.sym && sym && callchain_param.key == CCKEY_FUNCTION) { left = cnode->ms.sym->start; right = sym->start; + left_dso = cnode->ms.map->dso; + right_dso = node->map->dso; } else { left = cnode->ip; right = node->ip; } - if (left == right) { + if (left == right && left_dso == right_dso) { if (node->branch) { cnode->branch_count++;