Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1410183

[PATCH v7 14/14] perf callchain: Support aarch64 cross-platform

From He Kuang <hekuang@huawei.com>
Newsgroups linux.kernel
Subject [PATCH v7 14/14] perf callchain: Support aarch64 cross-platform
Date 2016-05-31 13:30 +0200
Message-ID <rEQ20-24b-75@gated-at.bofh.it> (permalink)
References <rEPSh-20r-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v7 00/14] Add support for remote unwind He Kuang <hekuang@huawei.com> - 2016-05-31 13:30 +0200
  [PATCH v7 11/14] perf tools: Change fixed name of libunwind__arch_reg_id to macro He Kuang <hekuang@huawei.com> - 2016-05-31 13:30 +0200
  [PATCH v7 06/14] perf tools: Separate local/remote libunwind config He Kuang <hekuang@huawei.com> - 2016-05-31 13:30 +0200
    Re: [PATCH v7 06/14] perf tools: Separate local/remote libunwind  config Jiri Olsa <jolsa@redhat.com> - 2016-06-01 10:40 +0200
  [PATCH v7 07/14] perf tools: Rename unwind-libunwind.c to unwind-libunwind-local.c He Kuang <hekuang@huawei.com> - 2016-05-31 13:30 +0200
  [PATCH v7 13/14] perf callchain: Support x86 target platform He Kuang <hekuang@huawei.com> - 2016-05-31 13:30 +0200
    Re: [PATCH v7 13/14] perf callchain: Support x86 target platform Jiri Olsa <jolsa@redhat.com> - 2016-06-01 10:50 +0200
      Re: [PATCH v7 13/14] perf callchain: Support x86 target platform Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-01 14:50 +0200
        Re: [PATCH v7 13/14] perf callchain: Support x86 target platform Jiri Olsa <jolsa@redhat.com> - 2016-06-01 15:20 +0200
    Re: [PATCH v7 13/14] perf callchain: Support x86 target platform Jiri Olsa <jolsa@redhat.com> - 2016-06-01 10:50 +0200
      Re: [PATCH v7 13/14] perf callchain: Support x86 target platform Hekuang <hekuang@huawei.com> - 2016-06-01 12:00 +0200
    Re: [PATCH v7 13/14] perf callchain: Support x86 target platform Jiri Olsa <jolsa@redhat.com> - 2016-06-01 10:50 +0200
  [PATCH v7 09/14] perf tools: Export normalize_arch() function He Kuang <hekuang@huawei.com> - 2016-05-31 13:30 +0200
  [PATCH v7 03/14] perf tools: Introducing struct unwind_libunwind_ops for local unwind He Kuang <hekuang@huawei.com> - 2016-05-31 13:30 +0200
    Re: [PATCH v7 03/14] perf tools: Introducing struct  unwind_libunwind_ops for local unwind Jiri Olsa <jolsa@redhat.com> - 2016-06-01 10:40 +0200
    Re: [PATCH v7 03/14] perf tools: Introducing struct  unwind_libunwind_ops for local unwind Jiri Olsa <jolsa@redhat.com> - 2016-06-01 10:50 +0200
  [PATCH v7 14/14] perf callchain: Support aarch64 cross-platform He Kuang <hekuang@huawei.com> - 2016-05-31 13:30 +0200
    Re: [PATCH v7 14/14] perf callchain: Support aarch64 cross-platform Jiri Olsa <jolsa@redhat.com> - 2016-06-01 10:50 +0200
      Re: [PATCH v7 14/14] perf callchain: Support aarch64 cross-platform Hekuang <hekuang@huawei.com> - 2016-06-01 12:10 +0200

csiph-web