Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52ffe0ff authored by He Kuang's avatar He Kuang Committed by Arnaldo Carvalho de Melo
Browse files

perf callchain: Support x86 target platform 



Support x86(32-bit) cross platform callchain unwind.

Signed-off-by: default avatarHe Kuang <hekuang@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1464924803-22214-14-git-send-email-hekuang@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 19473e7b

tools/perf/arch/x86/util/unwind-libunwind.c

+4 −2
Original line number Diff line number Diff line 


#ifndef REMOTE_UNWIND_LIBUNWIND

#include <errno.h>

#include <libunwind.h>

#include "perf_regs.h"

#include "../../util/unwind.h"

#include "../../util/debug.h"

#endif



#ifdef HAVE_ARCH_X86_64_SUPPORT

int libunwind__arch_reg_id(int regnum)

int LIBUNWIND__ARCH_REG_ID(int regnum)

{

	int id;
@@ -70,7 +72,7 @@ int libunwind__arch_reg_id(int regnum) 
	return id;

}

#else

int libunwind__arch_reg_id(int regnum)

int LIBUNWIND__ARCH_REG_ID(int regnum)

{

	int id;

tools/perf/config/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -354,6 +354,14 @@ endif 


ifndef NO_LIBUNWIND

  have_libunwind :=



  ifeq ($(feature-libunwind-x86), 1)

    $(call detected,CONFIG_LIBUNWIND_X86)

    CFLAGS += -DHAVE_LIBUNWIND_X86_SUPPORT

    LDFLAGS += -lunwind-x86

    have_libunwind = 1

  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

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ libperf-$(CONFIG_DWARF) += dwarf-aux.o 
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_LIBBABELTRACE) += data-convert-bt.o

tools/perf/util/libunwind/x86_32.c

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/*

 * This file setups defines to compile arch specific binary from the

 * generic one.

 *

 * The function 'LIBUNWIND__ARCH_REG_ID' name is set according to arch

 * name and the defination of this function is included directly from

 * 'arch/x86/util/unwind-libunwind.c', to make sure that this function

 * is defined no matter what arch the host is.

 *

 * Finally, the arch specific unwind methods are exported which will

 * be assigned to each x86 thread.

 */



#define REMOTE_UNWIND_LIBUNWIND

#define LIBUNWIND__ARCH_REG_ID(regnum) libunwind__x86_reg_id(regnum)



#include "unwind.h"

#include "debug.h"

#include "libunwind-x86.h"

#include <../../../../arch/x86/include/uapi/asm/perf_regs.h>



/* HAVE_ARCH_X86_64_SUPPORT is used in'arch/x86/util/unwind-libunwind.c'

 * for x86_32, we undef it to compile code for x86_32 only.

 */

#undef HAVE_ARCH_X86_64_SUPPORT

#include "../../arch/x86/util/unwind-libunwind.c"



/* Explicitly define NO_LIBUNWIND_DEBUG_FRAME, because non-ARM has no

 * dwarf_find_debug_frame() function.

 */

#ifndef NO_LIBUNWIND_DEBUG_FRAME

#define NO_LIBUNWIND_DEBUG_FRAME

#endif

#include "util/unwind-libunwind-local.c"



struct unwind_libunwind_ops *

x86_32_unwind_libunwind_ops = &_unwind_libunwind_ops;

tools/perf/util/unwind-libunwind.c

+13 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include "arch/common.h"



struct unwind_libunwind_ops __weak *local_unwind_libunwind_ops;

struct unwind_libunwind_ops __weak *x86_32_unwind_libunwind_ops;



static void unwind__register_ops(struct thread *thread,

			  struct unwind_libunwind_ops *ops)
@@ -16,6 +17,7 @@ int unwind__prepare_access(struct thread *thread, struct map *map) 
{

	const char *arch;

	enum dso_type dso_type;

	struct unwind_libunwind_ops *ops = local_unwind_libunwind_ops;



	if (thread->addr_space) {

		pr_debug("unwind: thread map already set, dso=%s\n",
@@ -32,9 +34,18 @@ int unwind__prepare_access(struct thread *thread, struct map *map) 
		return 0;



	arch = normalize_arch(thread->mg->machine->env->arch);

	pr_debug("unwind: target platform=%s\n", arch);



	if (!strcmp(arch, "x86")) {

		if (dso_type != DSO__TYPE_64BIT)

			ops = x86_32_unwind_libunwind_ops;

	}



	if (!ops) {

		pr_err("unwind: target platform=%s is not supported\n", arch);

		return -1;

	}

out_register:

	unwind__register_ops(thread, local_unwind_libunwind_ops);

	unwind__register_ops(thread, ops);



	return thread->unwind_libunwind_ops->prepare_access(thread);

}