From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751221AbdJDGOs (ORCPT ); Wed, 4 Oct 2017 02:14:48 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57664 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751049AbdJDGOq (ORCPT ); Wed, 4 Oct 2017 02:14:46 -0400 From: Ravi Bangoria To: pozdneyev@gmail.com, acme@kernel.org, linux-kernel@vger.kernel.org Cc: linux-perf-users@vger.kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, yao.jin@linux.intel.com, ak@linux.intel.com, jolsa@kernel.org, kjlx@templeofstupid.com, milian.wolff@kdab.com, zhangmengting@huawei.com, Ravi Bangoria Subject: [RFC] perf callchain: Compare dsos (as well) for CCKEY_FUNCTION Date: Wed, 4 Oct 2017 11:43:08 +0530 X-Mailer: git-send-email 2.9.3 In-Reply-To: References: X-TM-AS-MML: disable x-cbid: 17100406-0040-0000-0000-0000035942EA X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17100406-0041-0000-0000-00000CDA61DA Message-Id: <20171004061308.1246-1-ravi.bangoria@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-10-04_03:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1710040091 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- tools/perf/util/callchain.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 510b513..6d5a483 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -678,6 +678,9 @@ 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); @@ -689,12 +692,16 @@ 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; + if (cnode->ms.map && node->map) { + 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++; -- 1.8.3.1