Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934191AbcDMHUT (ORCPT ); Wed, 13 Apr 2016 03:20:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50684 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757097AbcDMHUQ (ORCPT ); Wed, 13 Apr 2016 03:20:16 -0400 Date: Wed, 13 Apr 2016 00:19:44 -0700 From: tip-bot for Wang Nan Message-ID: Cc: kirr@nexedi.com, linux-kernel@vger.kernel.org, hekuang@huawei.com, wangnan0@huawei.com, tglx@linutronix.de, dev@codyps.com, jolsa@kernel.org, hpa@zytor.com, acme@redhat.com, mingo@kernel.org, namhyung@kernel.org, lizefan@huawei.com, masami.hiramatsu.pt@hitachi.com, adrian.hunter@intel.com Reply-To: dev@codyps.com, tglx@linutronix.de, jolsa@kernel.org, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, masami.hiramatsu.pt@hitachi.com, lizefan@huawei.com, namhyung@kernel.org, adrian.hunter@intel.com, kirr@nexedi.com, linux-kernel@vger.kernel.org, hekuang@huawei.com, wangnan0@huawei.com In-Reply-To: <1460024671-64774-2-git-send-email-wangnan0@huawei.com> References: <1460024671-64774-2-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf symbols: Record text offset in dso to calculate objdump address Git-Commit-ID: a58f7033ba892b7d299954b94471450d72623039 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: 2782 Lines: 74 Commit-ID: a58f7033ba892b7d299954b94471450d72623039 Gitweb: http://git.kernel.org/tip/a58f7033ba892b7d299954b94471450d72623039 Author: Wang Nan AuthorDate: Thu, 7 Apr 2016 10:24:30 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 Apr 2016 09:58:14 -0300 perf symbols: Record text offset in dso to calculate objdump address In this patch, the offset of '.text' section is stored into dso and used here to re-calculate address to objdump. In most of the cases, executable code is in '.text' section, so the adjustment made to a symbol in dso__load_sym (using sym.st_value -= shdr.sh_addr - shdr.sh_offset) should equal to 'sym.st_value -= dso->text_offset'. Therefore, adding text_offset back get objdump address from symbol address (rip). However, it is not true for kernel and kernel module since there could be multiple executable sections with different offset. Exclude kernel for this reason. After this patch, even dso->adjust_symbols is set to true for shared objects, map__rip_2objdump() and map__objdump_2mem() would return correct result, so perf behavior of annotate won't be changed. Signed-off-by: Wang Nan Tested-by: Arnaldo Carvalho de Melo Cc: Adrian Hunter Cc: Cody P Schafer Cc: He Kuang Cc: Jiri Olsa Cc: Kirill Smelkov Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1460024671-64774-2-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/map.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 171b6d1..02c3186 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -431,6 +431,13 @@ u64 map__rip_2objdump(struct map *map, u64 rip) if (map->dso->rel) return rip - map->pgoff; + /* + * kernel modules also have DSO_TYPE_USER in dso->kernel, + * but all kernel modules are ET_REL, so won't get here. + */ + if (map->dso->kernel == DSO_TYPE_USER) + return rip + map->dso->text_offset; + return map->unmap_ip(map, rip) - map->reloc; } @@ -454,6 +461,13 @@ u64 map__objdump_2mem(struct map *map, u64 ip) if (map->dso->rel) return map->unmap_ip(map, ip + map->pgoff); + /* + * kernel modules also have DSO_TYPE_USER in dso->kernel, + * but all kernel modules are ET_REL, so won't get here. + */ + if (map->dso->kernel == DSO_TYPE_USER) + return map->unmap_ip(map, ip - map->dso->text_offset); + return ip + map->reloc; }