lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <1464081629-137191-5-git-send-email-hekuang@huawei.com> Date: Tue, 24 May 2016 09:20:28 +0000 From: He Kuang <hekuang@...wei.com> To: <peterz@...radead.org>, <mingo@...hat.com>, <acme@...nel.org>, <alexander.shishkin@...ux.intel.com>, <jolsa@...hat.com>, <wangnan0@...wei.com>, <hekuang@...wei.com>, <jpoimboe@...hat.com>, <ak@...ux.intel.com>, <eranian@...gle.com>, <namhyung@...nel.org>, <adrian.hunter@...el.com>, <sukadev@...ux.vnet.ibm.com>, <masami.hiramatsu.pt@...achi.com>, <tumanova@...ux.vnet.ibm.com>, <kan.liang@...el.com>, <penberg@...nel.org>, <dsahern@...il.com> CC: <linux-kernel@...r.kernel.org> Subject: [PATCH v5 4/5] perf callchain: Support x86 target platform Support x86(32-bit) cross platform callchain unwind. Signed-off-by: He Kuang <hekuang@...wei.com> --- .../perf/arch/x86/include/libunwind/libunwind-arch.h | 18 ++++++++++++++++++ tools/perf/arch/x86/util/unwind-libunwind.c | 19 ++++++++++++++----- tools/perf/util/Build | 6 ++++++ tools/perf/util/unwind-libunwind_common.c | 6 ++++-- tools/perf/util/unwind.h | 5 +++++ 5 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 tools/perf/arch/x86/include/libunwind/libunwind-arch.h diff --git a/tools/perf/arch/x86/include/libunwind/libunwind-arch.h b/tools/perf/arch/x86/include/libunwind/libunwind-arch.h new file mode 100644 index 0000000..be8c675 --- /dev/null +++ b/tools/perf/arch/x86/include/libunwind/libunwind-arch.h @@ -0,0 +1,18 @@ +#ifndef _LIBUNWIND_ARCH_H +#define _LIBUNWIND_ARCH_H + +#include <libunwind-x86.h> +#include <../perf_regs.h> +#include <../../../../../../arch/x86/include/uapi/asm/perf_regs.h> + +#define LIBUNWIND_X86_32 +int libunwind__x86_reg_id(int regnum); + +#define LIBUNWIND__ARCH_REG_ID libunwind__x86_reg_id + +#include <../../../x86/util/unwind-libunwind.c> + +#define UNWT_PREFIX UNW_PASTE(UNW_PASTE(_U, x86), _) +#define UNWT_OBJ(fn) UNW_PASTE(UNWT_PREFIX, fn) + +#endif /* _LIBUNWIND_ARCH_H */ diff --git a/tools/perf/arch/x86/util/unwind-libunwind.c b/tools/perf/arch/x86/util/unwind-libunwind.c index db25e93..28831d8 100644 --- a/tools/perf/arch/x86/util/unwind-libunwind.c +++ b/tools/perf/arch/x86/util/unwind-libunwind.c @@ -1,12 +1,18 @@ #include <errno.h> +#if defined(LIBUNWIND_X86_32) +#include <libunwind-x86.h> +#elif defined(LIBUNWIND_X86_64) +#include <libunwind-x86_64.h> +#elif defined(HAVE_LIBUNWIND_LOCAL_SUPPORT) #include <libunwind.h> +#endif #include "perf_regs.h" #include "../../util/unwind.h" #include "../../util/debug.h" -#ifdef HAVE_ARCH_X86_64_SUPPORT -int libunwind__arch_reg_id(int regnum) +#if !defined(REMOTE_UNWIND_LIBUNWIND) && defined(HAVE_ARCH_X86_64_SUPPORT) +int LIBUNWIND__ARCH_REG_ID(int regnum) { int id; @@ -69,8 +75,11 @@ int libunwind__arch_reg_id(int regnum) return id; } -#else -int libunwind__arch_reg_id(int regnum) +#endif + +#if !defined(REMOTE_UNWIND_LIBUNWIND) && !defined(HAVE_ARCH_X86_64_SUPPORT) || \ + defined(LIBUNWIND_X86_32) +int LIBUNWIND__ARCH_REG_ID(int regnum) { int id; @@ -109,4 +118,4 @@ int libunwind__arch_reg_id(int regnum) return id; } -#endif /* HAVE_ARCH_X86_64_SUPPORT */ +#endif diff --git a/tools/perf/util/Build b/tools/perf/util/Build index ce69721..2373130 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -1,3 +1,5 @@ +include ../scripts/Makefile.include + libperf-y += alias.o libperf-y += annotate.o libperf-y += build-id.o @@ -101,6 +103,10 @@ libperf-$(CONFIG_DWARF) += dwarf-aux.o libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind_common.o +libperf-$(CONFIG_LIBUNWIND_X86) += unwind-libunwind_x86_32.o + +$(OUTPUT)util/unwind-libunwind_x86_32.o: util/unwind-libunwind.c arch/x86/util/unwind-libunwind.c + $(QUIET_CC)$(CC) $(CFLAGS) -DREMOTE_UNWIND_LIBUNWIND -Iarch/x86/include/libunwind -c -o $@ util/unwind-libunwind.c libperf-$(CONFIG_LIBBABELTRACE) += data-convert-bt.o diff --git a/tools/perf/util/unwind-libunwind_common.c b/tools/perf/util/unwind-libunwind_common.c index f44833b..619c6c0 100644 --- a/tools/perf/util/unwind-libunwind_common.c +++ b/tools/perf/util/unwind-libunwind_common.c @@ -82,9 +82,11 @@ void unwind__get_arch(struct thread *thread, struct map *map) if (!strcmp(arch, "x86")) { if (dso_type != DSO__TYPE_64BIT) { #ifdef HAVE_LIBUNWIND_X86_SUPPORT - pr_err("unwind: target platform=%s is not implemented\n", arch); -#endif + register_unwind_libunwind_ops( + &_Ux86_unwind_libunwind_ops, thread); +#else register_null_unwind_libunwind_ops(thread); +#endif use_local_unwind = 0; } } diff --git a/tools/perf/util/unwind.h b/tools/perf/util/unwind.h index e170be7..7dafb6e 100644 --- a/tools/perf/util/unwind.h +++ b/tools/perf/util/unwind.h @@ -56,6 +56,11 @@ static inline void unwind__get_arch(struct thread *thread __maybe_unused, static inline void register_null_unwind_libunwind_ops(struct thread *thread __maybe_unused) {} #endif + +#ifdef HAVE_LIBUNWIND_X86_SUPPORT +extern struct unwind_libunwind_ops _Ux86_unwind_libunwind_ops; +#endif + #else static inline int unwind__get_entries(unwind_entry_cb_t cb __maybe_unused, -- 1.8.5.2
Powered by blists - more mailing lists