From: He Kuang <hekuang@huawei.com>
To: <peterz@infradead.org>, <mingo@redhat.com>, <acme@kernel.org>,
<alexander.shishkin@linux.intel.com>, <jolsa@redhat.com>,
<wangnan0@huawei.com>, <hekuang@huawei.com>,
<jpoimboe@redhat.com>, <ak@linux.intel.com>, <eranian@google.com>,
<namhyung@kernel.org>, <adrian.hunter@intel.com>,
<sukadev@linux.vnet.ibm.com>, <masami.hiramatsu.pt@hitachi.com>,
<tumanova@linux.vnet.ibm.com>, <kan.liang@intel.com>,
<penberg@kernel.org>, <dsahern@gmail.com>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH v6 03/11] perf tools: Introducing struct unwind_libunwind_ops for local unwind
Date: Sat, 28 May 2016 11:59:52 +0000 [thread overview]
Message-ID: <1464436800-39860-4-git-send-email-hekuang@huawei.com> (raw)
In-Reply-To: <1464436800-39860-1-git-send-email-hekuang@huawei.com>
Currently, libunwind operations are fixed, and they are chosen
according to the host architecture. This will lead a problem that if a
thread is run as x86_32 on x86_64 machine, perf will use libunwind
methods for x86_64 to parse the callchain and get wrong result.
This patch changes the fixed methods of libunwind operations to
thread/map related, and each thread can have indivadual libunwind
operations. Local libunwind methods are registered as default value.
Signed-off-by: He Kuang <hekuang@huawei.com>
---
tools/perf/util/thread.c | 2 ++
tools/perf/util/thread.h | 14 +++++++++-
tools/perf/util/unwind-libunwind.c | 55 ++++++++++++++++++++++++++++++++++----
tools/perf/util/unwind.h | 5 ++++
4 files changed, 70 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 45fcb71..6d3900c 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -43,6 +43,8 @@ struct thread *thread__new(pid_t pid, pid_t tid)
thread->cpu = -1;
INIT_LIST_HEAD(&thread->comm_list);
+ register_local_unwind_libunwind_ops(thread);
+
if (unwind__prepare_access(thread) < 0)
goto err_thread;
diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h
index aa3a8ff..647b011 100644
--- a/tools/perf/util/thread.h
+++ b/tools/perf/util/thread.h
@@ -12,6 +12,17 @@
struct thread_stack;
+struct unwind_entry;
+typedef int (*unwind_entry_cb_t)(struct unwind_entry *entry, void *arg);
+struct unwind_libunwind_ops {
+ int (*prepare_access)(struct thread *thread);
+ void (*flush_access)(struct thread *thread);
+ void (*finish_access)(struct thread *thread);
+ int (*get_entries)(unwind_entry_cb_t cb, void *arg,
+ struct thread *thread,
+ struct perf_sample *data, int max_stack);
+};
+
struct thread {
union {
struct rb_node rb_node;
@@ -33,7 +44,8 @@ struct thread {
void *priv;
struct thread_stack *ts;
#ifdef HAVE_LIBUNWIND_SUPPORT
- void *addr_space;
+ void *addr_space;
+ struct unwind_libunwind_ops *unwind_libunwind_ops;
#endif
};
diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index 63687d3..0277b22 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -23,7 +23,6 @@
#include <sys/mman.h>
#include <linux/list.h>
#include <libunwind.h>
-#include <libunwind-ptrace.h>
#include "callchain.h"
#include "thread.h"
#include "session.h"
@@ -579,7 +578,7 @@ static unw_accessors_t accessors = {
.get_proc_name = get_proc_name,
};
-int unwind__prepare_access(struct thread *thread)
+static int _unwind__prepare_access(struct thread *thread)
{
if (callchain_param.record_mode != CALLCHAIN_DWARF)
return 0;
@@ -594,7 +593,7 @@ int unwind__prepare_access(struct thread *thread)
return 0;
}
-void unwind__flush_access(struct thread *thread)
+static void _unwind__flush_access(struct thread *thread)
{
if (callchain_param.record_mode != CALLCHAIN_DWARF)
return;
@@ -602,7 +601,7 @@ void unwind__flush_access(struct thread *thread)
unw_flush_cache(thread->addr_space, 0, 0);
}
-void unwind__finish_access(struct thread *thread)
+static void _unwind__finish_access(struct thread *thread)
{
if (callchain_param.record_mode != CALLCHAIN_DWARF)
return;
@@ -662,7 +661,7 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,
return ret;
}
-int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
+static int _unwind__get_entries(unwind_entry_cb_t cb, void *arg,
struct thread *thread,
struct perf_sample *data, int max_stack)
{
@@ -680,3 +679,49 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
return get_entries(&ui, cb, arg, max_stack);
}
+
+static struct unwind_libunwind_ops
+_unwind_libunwind_ops = {
+ .prepare_access = _unwind__prepare_access,
+ .flush_access = _unwind__flush_access,
+ .finish_access = _unwind__finish_access,
+ .get_entries = _unwind__get_entries,
+};
+
+void register_local_unwind_libunwind_ops(struct thread *thread)
+{
+ thread->unwind_libunwind_ops = &_unwind_libunwind_ops;
+}
+
+int unwind__prepare_access(struct thread *thread)
+{
+ if (thread->unwind_libunwind_ops)
+ return thread->unwind_libunwind_ops->prepare_access(thread);
+ else
+ return 0;
+}
+
+void unwind__flush_access(struct thread *thread)
+{
+ if (thread->unwind_libunwind_ops)
+ thread->unwind_libunwind_ops->flush_access(thread);
+}
+
+void unwind__finish_access(struct thread *thread)
+{
+ if (thread->unwind_libunwind_ops)
+ thread->unwind_libunwind_ops->finish_access(thread);
+}
+
+int unwind__get_entries(unwind_entry_cb_t cb, void *arg,
+ struct thread *thread,
+ struct perf_sample *data, int max_stack)
+{
+ if (thread->unwind_libunwind_ops)
+ return thread->unwind_libunwind_ops->get_entries(cb, arg,
+ thread,
+ data,
+ max_stack);
+ else
+ return 0;
+}
diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h
index 12790cf..5f36415 100644
--- a/tools/perf/util/unwind.h
+++ b/tools/perf/util/unwind.h
@@ -24,6 +24,7 @@ int libunwind__arch_reg_id(int regnum);
int unwind__prepare_access(struct thread *thread);
void unwind__flush_access(struct thread *thread);
void unwind__finish_access(struct thread *thread);
+void register_local_unwind_libunwind_ops(struct thread *thread);
#else
static inline int unwind__prepare_access(struct thread *thread __maybe_unused)
{
@@ -32,6 +33,8 @@ static inline int unwind__prepare_access(struct thread *thread __maybe_unused)
static inline void unwind__flush_access(struct thread *thread __maybe_unused) {}
static inline void unwind__finish_access(struct thread *thread __maybe_unused) {}
+static inline void
+register_local_unwind_libunwind_ops(struct thread *thread __maybe_unused) {}
#endif
#else
static inline int
@@ -51,5 +54,7 @@ static inline int unwind__prepare_access(struct thread *thread __maybe_unused)
static inline void unwind__flush_access(struct thread *thread __maybe_unused) {}
static inline void unwind__finish_access(struct thread *thread __maybe_unused) {}
+static inline void
+register_local_unwind_libunwind_ops(struct thread *thread __maybe_unused) {}
#endif /* HAVE_DWARF_UNWIND_SUPPORT */
#endif /* __UNWIND_H */
--
1.8.5.2
next prev parent reply other threads:[~2016-05-28 12:03 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-28 11:59 [PATCH v6 00/11] Add support for remote unwind He Kuang
2016-05-28 11:59 ` [PATCH v6 01/11] perf tools: Use LIBUNWIND_DIR for remote libunwind feature check He Kuang
2016-05-28 11:59 ` [PATCH v6 02/11] perf tools: Decouple thread->address_space on libunwind He Kuang
2016-05-28 11:59 ` He Kuang [this message]
2016-05-30 8:53 ` [PATCH v6 03/11] perf tools: Introducing struct unwind_libunwind_ops for local unwind Jiri Olsa
2016-05-28 11:59 ` [PATCH v6 04/11] perf tools: Move unwind__prepare_access from thread_new into thread__insert_map He Kuang
2016-05-30 8:52 ` Jiri Olsa
2016-05-28 11:59 ` [PATCH v6 05/11] perf tools: Separate local/remote libunwind config He Kuang
2016-05-30 8:52 ` Jiri Olsa
2016-05-28 11:59 ` [PATCH v6 06/11] perf tools: Extract local libunwind code out of unwind-libunwind.c He Kuang
2016-05-28 12:10 ` Wangnan (F)
2016-05-30 3:22 ` [PATCH v6 06/11 1 update 1/2] perf tools: Rename unwind-libunwind.c to unwind-libunwind-local.c He Kuang
2016-05-30 3:22 ` [PATCH v6 06/11 1 update 2/2] perf tools: Extract common API out of unwind-libunwind-local.c He Kuang
2016-05-30 3:24 ` [PATCH v6 06/11] perf tools: Extract local libunwind code out of unwind-libunwind.c Hekuang
2016-05-28 11:59 ` [PATCH v6 07/11] perf tools: Export normalize_arch() function He Kuang
2016-05-28 11:59 ` [PATCH v6 08/11] perf tools: Show warnings for unsupported cross-platform unwind He Kuang
2016-05-30 8:53 ` Jiri Olsa
2016-05-28 11:59 ` [PATCH v6 09/11] perf tools: Change fixed name of libunwind__arch_reg_id to macro He Kuang
2016-05-28 11:59 ` [PATCH v6 10/11] perf callchain: Support x86 target platform He Kuang
2016-05-30 8:52 ` Jiri Olsa
2016-05-30 8:53 ` Jiri Olsa
2016-05-30 8:53 ` Jiri Olsa
2016-05-30 9:11 ` Hekuang
2016-05-30 9:30 ` Jiri Olsa
2016-05-30 10:58 ` Hekuang
2016-05-30 14:24 ` Jiri Olsa
2016-05-28 12:00 ` [PATCH v6 11/11] perf callchain: Support aarch64 cross-platform He Kuang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464436800-39860-4-git-send-email-hekuang@huawei.com \
--to=hekuang@huawei.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=jpoimboe@redhat.com \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=penberg@kernel.org \
--cc=peterz@infradead.org \
--cc=sukadev@linux.vnet.ibm.com \
--cc=tumanova@linux.vnet.ibm.com \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®