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

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

perf unwind: Introduce 'struct unwind_libunwind_ops' for local unwind 



Currently, libunwind operations are fixed, and they are chosen according
to the host architecture. This will lead to a problem that if a thread
is run as x86_32 on a x86_64 machine, perf will use libunwind methods
for x86_64 to parse the callchain and get wrong results.

This patch changes the fixed methods of libunwind operations to be
thread/map related, and each thread can have individual libunwind
operations. Local libunwind methods are registered as default value.

Signed-off-by: default avatarHe Kuang <hekuang@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
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-4-git-send-email-hekuang@huawei.com


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

tools/perf/util/thread.h

+3 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <intlist.h>



struct thread_stack;

struct unwind_libunwind_ops;



struct thread {

	union {
@@ -34,6 +35,7 @@ struct thread { 
	struct thread_stack	*ts;

#ifdef HAVE_LIBUNWIND_SUPPORT

	void				*addr_space;

	struct unwind_libunwind_ops	*unwind_libunwind_ops;

#endif

};

tools/perf/util/unwind-libunwind.c

+49 −4
Original line number Diff line number Diff line
@@ -579,7 +579,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 +594,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 +602,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 +662,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 +680,48 @@ 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,

};



struct unwind_libunwind_ops *

local_unwind_libunwind_ops = &_unwind_libunwind_ops;



static void unwind__register_ops(struct thread *thread,

				 struct unwind_libunwind_ops *ops)

{

	thread->unwind_libunwind_ops = ops;

}



int unwind__prepare_access(struct thread *thread)

{

	unwind__register_ops(thread, local_unwind_libunwind_ops);



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

}



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);

	return 0;

}

tools/perf/util/unwind.h

+9 −0
Original line number Diff line number Diff line
@@ -14,6 +14,15 @@ 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);

};



#ifdef HAVE_DWARF_UNWIND_SUPPORT

int unwind__get_entries(unwind_entry_cb_t cb, void *arg,

			struct thread *thread,