From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932555AbdJYCMR (ORCPT ); Tue, 24 Oct 2017 22:12:17 -0400 Received: from LGEAMRELO11.lge.com ([156.147.23.51]:53127 "EHLO lgeamrelo11.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932382AbdJYCMN (ORCPT ); Tue, 24 Oct 2017 22:12:13 -0400 X-Original-SENDERIP: 156.147.1.121 X-Original-MAILFROM: namhyung@kernel.org X-Original-SENDERIP: 10.177.227.17 X-Original-MAILFROM: namhyung@kernel.org From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , LKML , kernel-team@lge.com, Milian Wolff Subject: [PATCH] perf callchain: Pass relative address to hist entry Date: Wed, 25 Oct 2017 11:12:09 +0900 Message-Id: <20171025021209.13180-1-namhyung@kernel.org> X-Mailer: git-send-email 2.14.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The addr_location->addr should have relative address to be passed to hist entry so that it can compare with others which might come from a different address space. The callchain_cursor_node->ip already has a relative address thus it should not map it again. But I found a bug handling cumulative (children) entries. For chilren entries that has no self period, the al->addr (so he->ip) ends up having an doubly-mapped address. It seems to be there from the beginning but only affects entries that have no srclines - finding srcline itself is done using a different address but it will show the invalid address if no srcline was found. Tested-by: Milian Wolff Fixes: c7405d85d7a3 ("perf tools: Update cpumode for each cumulative entry") Signed-off-by: Namhyung Kim --- tools/perf/util/callchain.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 3a3916934a92..837012147c7b 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -1091,10 +1091,7 @@ int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node * al->map = node->map; al->sym = node->sym; al->srcline = node->srcline; - if (node->map) - al->addr = node->map->map_ip(node->map, node->ip); - else - al->addr = node->ip; + al->addr = node->ip; if (al->sym == NULL) { if (hide_unresolved) -- 2.14.2