From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932672AbcFBJ4I (ORCPT ); Thu, 2 Jun 2016 05:56:08 -0400 Received: from szxga05-in.huawei.com ([58.251.152.179]:36675 "EHLO szxga05-in.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753098AbcFBJ4A (ORCPT ); Thu, 2 Jun 2016 05:56:00 -0400 From: He Kuang To: , , , , , , , , , , , , , , , , , CC: Subject: [PATCH v8 10/14] perf tools: Check the target platform before assigning unwind methods Date: Thu, 2 Jun 2016 09:55:22 +0000 Message-ID: <1464861326-22677-11-git-send-email-hekuang@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1464861326-22677-1-git-send-email-hekuang@huawei.com> References: <1464861326-22677-1-git-send-email-hekuang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.193.250] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090206.575002A8.007E,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: b09af13b69e6a0057b06989f61164a8e Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, perf script uses host unwind methods to parse perf.data callchain info regardless of the target architecture. So we get wrong result without any warnings when unwinding callchains of x86(32-bit) on x86(64-bit) machine. This patch adds extra step that check the target platform before assigning unwind methods. In the latter patches in this series, we can use this info to assign the right unwind methods for supported platforms. Signed-off-by: He Kuang --- tools/perf/util/thread.c | 2 +- tools/perf/util/unwind-libunwind.c | 24 +++++++++++++++++++++++- tools/perf/util/unwind.h | 5 +++-- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index a33e76c..dfb3924 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -205,7 +205,7 @@ int thread__insert_map(struct thread *thread, struct map *map) map_groups__fixup_overlappings(thread->mg, map, stderr); map_groups__insert(thread->mg, map); - ret = unwind__prepare_access(thread); + ret = unwind__prepare_access(thread, map); if (ret) map_groups__remove(thread->mg, map); diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c index 787adbb..8e87884 100644 --- a/tools/perf/util/unwind-libunwind.c +++ b/tools/perf/util/unwind-libunwind.c @@ -1,5 +1,8 @@ #include "unwind.h" #include "thread.h" +#include "session.h" +#include "debug.h" +#include "arch/common.h" struct unwind_libunwind_ops __weak *local_unwind_libunwind_ops; @@ -9,8 +12,27 @@ void unwind__register_ops(struct thread *thread, thread->unwind_libunwind_ops = ops; } -int unwind__prepare_access(struct thread *thread) +int unwind__prepare_access(struct thread *thread, struct map *map) { + const char *arch; + enum dso_type dso_type; + + if (thread->addr_space) { + pr_debug("unwind: thread map already set, dso=%s\n", + map->dso->name); + return 0; + } + + if (!thread->mg->machine->env) + return 0; + + dso_type = dso__type(map->dso, thread->mg->machine); + if (dso_type == DSO__TYPE_UNKNOWN) + return 0; + + arch = normalize_arch(thread->mg->machine->env->arch); + pr_debug("unwind: target platform=%s\n", arch); + unwind__register_ops(thread, local_unwind_libunwind_ops); return thread->unwind_libunwind_ops->prepare_access(thread); diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h index 25001be..dda2156 100644 --- a/tools/perf/util/unwind.h +++ b/tools/perf/util/unwind.h @@ -30,13 +30,14 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg, /* libunwind specific */ #ifdef HAVE_LIBUNWIND_SUPPORT int libunwind__arch_reg_id(int regnum); -int unwind__prepare_access(struct thread *thread); +int unwind__prepare_access(struct thread *thread, struct map *map); void unwind__flush_access(struct thread *thread); void unwind__finish_access(struct thread *thread); void unwind__register_ops(struct thread *thread, struct unwind_libunwind_ops *ops); #else -static inline int unwind__prepare_access(struct thread *thread __maybe_unused) +static inline int unwind__prepare_access(struct thread *thread __maybe_unused, + struct map *map __maybe_unused) { return 0; } -- 1.8.5.2