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 v7 14/14] perf callchain: Support aarch64 cross-platform
Date: Tue, 31 May 2016 11:19:12 +0000 [thread overview]
Message-ID: <1464693552-104294-15-git-send-email-hekuang@huawei.com> (raw)
In-Reply-To: <1464693552-104294-1-git-send-email-hekuang@huawei.com>
Support aarch64 cross platform callchain unwind.
Signed-off-by: He Kuang <hekuang@huawei.com>
---
tools/perf/arch/arm64/util/unwind-libunwind.c | 4 +++-
tools/perf/config/Makefile | 12 ++++++++++++
tools/perf/util/Build | 1 +
tools/perf/util/libunwind/arm64.c | 18 ++++++++++++++++++
tools/perf/util/unwind-libunwind.c | 7 ++++++-
5 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644 tools/perf/util/libunwind/arm64.c
diff --git a/tools/perf/arch/arm64/util/unwind-libunwind.c b/tools/perf/arch/arm64/util/unwind-libunwind.c
index a87afa9..c116b71 100644
--- a/tools/perf/arch/arm64/util/unwind-libunwind.c
+++ b/tools/perf/arch/arm64/util/unwind-libunwind.c
@@ -1,11 +1,13 @@
+#ifndef REMOTE_UNWIND_LIBUNWIND
#include <errno.h>
#include <libunwind.h>
#include "perf_regs.h"
#include "../../util/unwind.h"
#include "../../util/debug.h"
+#endif
-int libunwind__arch_reg_id(int regnum)
+int LIBUNWIND__ARCH_REG_ID(int regnum)
{
switch (regnum) {
case UNW_AARCH64_X0:
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index b8d8a77..00bd141 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -362,6 +362,18 @@ ifndef NO_LIBUNWIND
have_libunwind = 1
endif
+ ifeq ($(feature-libunwind-aarch64), 1)
+ $(call detected,CONFIG_LIBUNWIND_AARCH64)
+ CFLAGS += -DHAVE_LIBUNWIND_AARCH64_SUPPORT
+ LDFLAGS += -lunwind-aarch64
+ have_libunwind = 1
+ $(call feature_check,libunwind-debug-frame-aarch64)
+ ifneq ($(feature-libunwind-debug-frame-aarch64), 1)
+ msg := $(warning No debug_frame support found in libunwind-aarch64);
+ CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME_AARCH64
+ endif
+ endif
+
ifneq ($(feature-libunwind), 1)
msg := $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR);
NO_LOCAL_LIBUNWIND := 1
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index 7746e09..fced833 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -102,6 +102,7 @@ libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind-local.o
libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o
libperf-$(CONFIG_LIBUNWIND_X86) += libunwind/x86_32.o
+libperf-$(CONFIG_LIBUNWIND_AARCH64) += libunwind/arm64.o
libperf-$(CONFIG_LIBBABELTRACE) += data-convert-bt.o
diff --git a/tools/perf/util/libunwind/arm64.c b/tools/perf/util/libunwind/arm64.c
new file mode 100644
index 0000000..99c0d42
--- /dev/null
+++ b/tools/perf/util/libunwind/arm64.c
@@ -0,0 +1,18 @@
+#define REMOTE_UNWIND_LIBUNWIND
+
+#define LIBUNWIND__ARCH_REG_ID libunwind__arm64_reg_id
+
+#include "unwind.h"
+#include "debug.h"
+#include "libunwind-aarch64.h"
+#include <../../../../arch/arm64/include/uapi/asm/perf_regs.h>
+#include "../../arch/arm64/util/unwind-libunwind.c"
+
+#undef NO_LIBUNWIND_DEBUG_FRAME
+#ifdef NO_LIBUNWIND_DEBUG_FRAME_AARCH64
+#define NO_LIBUNWIND_DEBUG_FRAME
+#endif
+#include "util/unwind-libunwind-local.c"
+
+struct unwind_libunwind_ops *
+arm64_unwind_libunwind_ops = &_unwind_libunwind_ops;
diff --git a/tools/perf/util/unwind-libunwind.c b/tools/perf/util/unwind-libunwind.c
index 5774317..b5f6ca2 100644
--- a/tools/perf/util/unwind-libunwind.c
+++ b/tools/perf/util/unwind-libunwind.c
@@ -6,6 +6,7 @@
struct unwind_libunwind_ops __weak *local_unwind_libunwind_ops;
struct unwind_libunwind_ops __weak *x86_32_unwind_libunwind_ops;
+struct unwind_libunwind_ops __weak *arm64_unwind_libunwind_ops;
void unwind__register_ops(struct thread *thread,
struct unwind_libunwind_ops *ops)
@@ -32,9 +33,13 @@ int unwind__prepare_access(struct thread *thread, struct map *map)
arch = normalize_arch(thread->mg->machine->env->arch);
- if (!strcmp(arch, "x86"))
+ if (!strcmp(arch, "x86")) {
if (dso_type != DSO__TYPE_64BIT)
ops = x86_32_unwind_libunwind_ops;
+ } else if (!strcmp(arch, "arm64") || !strcmp(arch, "arm")) {
+ if (dso_type == DSO__TYPE_64BIT)
+ ops = arm64_unwind_libunwind_ops;
+ }
if (!ops)
pr_err("unwind: target platform=%s is not supported\n", arch);
--
1.8.5.2
next prev parent reply other threads:[~2016-05-31 11:19 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 11:18 [PATCH v7 00/14] Add support for remote unwind He Kuang
2016-05-31 11:18 ` [PATCH v7 01/14] perf tools: Use LIBUNWIND_DIR for remote libunwind feature check He Kuang
2016-05-31 11:19 ` [PATCH v7 02/14] perf tools: Decouple thread->address_space on libunwind He Kuang
2016-05-31 11:19 ` [PATCH v7 03/14] perf tools: Introducing struct unwind_libunwind_ops for local unwind He Kuang
2016-06-01 8:39 ` Jiri Olsa
2016-06-01 8:39 ` Jiri Olsa
2016-05-31 11:19 ` [PATCH v7 04/14] perf tools: Move unwind__prepare_access from thread_new into thread__insert_map He Kuang
2016-06-01 8:39 ` Jiri Olsa
2016-05-31 11:19 ` [PATCH v7 05/14] perf tools: Don't mix LIBUNWIND_LIBS into LIBUNWIND_LDFLAGS He Kuang
2016-05-31 11:19 ` [PATCH v7 06/14] perf tools: Separate local/remote libunwind config He Kuang
2016-06-01 8:39 ` Jiri Olsa
2016-05-31 11:19 ` [PATCH v7 07/14] perf tools: Rename unwind-libunwind.c to unwind-libunwind-local.c He Kuang
2016-05-31 11:19 ` [PATCH v7 08/14] perf tools: Extract common API out of unwind-libunwind-local.c He Kuang
2016-05-31 11:19 ` [PATCH v7 09/14] perf tools: Export normalize_arch() function He Kuang
2016-05-31 11:19 ` [PATCH v7 10/14] perf tools: Check the target platform before assigning unwind methods He Kuang
2016-06-01 8:40 ` Jiri Olsa
2016-06-01 8:40 ` Jiri Olsa
2016-06-01 10:02 ` Hekuang
2016-05-31 11:19 ` [PATCH v7 11/14] perf tools: Change fixed name of libunwind__arch_reg_id to macro He Kuang
2016-05-31 11:19 ` [PATCH v7 12/14] perf tools: Introduce flag to separate local/remote unwind compilation He Kuang
2016-05-31 11:19 ` [PATCH v7 13/14] perf callchain: Support x86 target platform He Kuang
2016-06-01 8:40 ` Jiri Olsa
2016-06-01 12:47 ` Arnaldo Carvalho de Melo
2016-06-01 13:14 ` Jiri Olsa
2016-06-01 8:40 ` Jiri Olsa
2016-06-01 9:53 ` Hekuang
2016-06-01 8:41 ` Jiri Olsa
2016-05-31 11:19 ` He Kuang [this message]
2016-06-01 8:40 ` [PATCH v7 14/14] perf callchain: Support aarch64 cross-platform Jiri Olsa
2016-06-01 9:54 ` Hekuang
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=1464693552-104294-15-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®