From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423195AbcFHIug (ORCPT ); Wed, 8 Jun 2016 04:50:36 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54554 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161878AbcFHIub (ORCPT ); Wed, 8 Jun 2016 04:50:31 -0400 Date: Wed, 8 Jun 2016 01:49:47 -0700 From: tip-bot for He Kuang Message-ID: Cc: sukadev@linux.vnet.ibm.com, eranian@google.com, hekuang@huawei.com, linux-kernel@vger.kernel.org, kan.liang@intel.com, mingo@kernel.org, peterz@infradead.org, namhyung@kernel.org, dsahern@gmail.com, mhiramat@kernel.org, penberg@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, acme@redhat.com, ak@linux.intel.com, tumanova@linux.vnet.ibm.com, adrian.hunter@intel.com, jolsa@kernel.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, jpoimboe@redhat.com Reply-To: linux-kernel@vger.kernel.org, kan.liang@intel.com, mingo@kernel.org, sukadev@linux.vnet.ibm.com, hekuang@huawei.com, eranian@google.com, dsahern@gmail.com, peterz@infradead.org, namhyung@kernel.org, wangnan0@huawei.com, tglx@linutronix.de, mhiramat@kernel.org, penberg@kernel.org, acme@redhat.com, tumanova@linux.vnet.ibm.com, ak@linux.intel.com, adrian.hunter@intel.com, jolsa@kernel.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, jpoimboe@redhat.com In-Reply-To: <1464924803-22214-11-git-send-email-hekuang@huawei.com> References: <1464924803-22214-11-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf unwind: Check the target platform before assigning unwind methods Git-Commit-ID: d64ec10ec8b43a519f132e7c33c1815a4e86949e 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: d64ec10ec8b43a519f132e7c33c1815a4e86949e Gitweb: http://git.kernel.org/tip/d64ec10ec8b43a519f132e7c33c1815a4e86949e Author: He Kuang AuthorDate: Fri, 3 Jun 2016 03:33:19 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 7 Jun 2016 15:09:36 -0300 perf unwind: Check the target platform before assigning unwind methods Currently, 'perf script' uses host unwind methods to parse perf.data callchain info without taking the target architecture into account, i.e. assuming the perf.data file was generated on the same machine where the analysis is being performed. So we get wrong result without any warnings when unwinding callchains of x86(32-bit) on x86(64-bit) machine. This patch adds an extra step that checks the target platform before assigning unwind methods. In later patches in this series, we can use this info to assign the right unwind methods for supported platforms. Committer note: After fixing it to register the local unwinder for live mode tools ('perf trace', 'perf top'), i.e. tools that don't use a perf.data file, it works as intended and passes the 'perf test unwind' test: # perf trace -e nanosleep --call dwarf usleep 1 0.328 ( 0.058 ms): usleep/11115 nanosleep(rqtp: 0x7fff083fa480) = 0 __nanosleep_nocancel+0x7 (/usr/lib64/libc-2.22.so) usleep+0x34 (/usr/lib64/libc-2.22.so) main+0x1eb (/usr/bin/usleep) __libc_start_main+0xf0 (/usr/lib64/libc-2.22.so) _start+0x29 (/usr/bin/usleep) # perf test 48 48: Test dwarf unwind : Ok # Signed-off-by: He Kuang Acked-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: David Ahern Cc: Ekaterina Tumanova Cc: Josh Poimboeuf Cc: Kan Liang Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Pekka Enberg Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Sukadev Bhattiprolu Cc: Wang Nan Link: http://lkml.kernel.org/r/1464924803-22214-11-git-send-email-hekuang@huawei.com [ Fixed exit path for 'live' mode tools, where we need to default to local unwinding ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/thread.c | 2 +- tools/perf/util/unwind-libunwind.c | 25 ++++++++++++++++++++++++- tools/perf/util/unwind.h | 8 +++++--- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c index 0bf55256..f30f956 100644 --- a/tools/perf/util/thread.c +++ b/tools/perf/util/thread.c @@ -202,7 +202,7 @@ int thread__insert_map(struct thread *thread, struct map *map) { int ret; - ret = unwind__prepare_access(thread); + ret = unwind__prepare_access(thread, map); if (ret) return ret; diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c index f86f903..0086726 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,28 @@ static 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; + } + + /* env->arch is NULL for live-mode (i.e. perf top) */ + if (!thread->mg->machine->env || !thread->mg->machine->env->arch) + goto out_register; + + 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); +out_register: 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 bbd73d9..bf9f593 100644 --- a/tools/perf/util/unwind.h +++ b/tools/perf/util/unwind.h @@ -30,11 +30,12 @@ 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); #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; } @@ -53,7 +54,8 @@ unwind__get_entries(unwind_entry_cb_t cb __maybe_unused, return 0; } -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; }