perf callchain: Create an address space per thread
Namhyung Kim
maintainerPATCH v2 1/2 perf callchain: Create an address space per thread
The unw_addr_space_t in libunwind represents an address space to be used for stack unwinding. It doesn't need to be create/destory everytime to unwind callchain (as in get_entries) and can have a same lifetime as thread (unless exec called).
So move the address space construction/destruction logic to the thread lifetime handling functions. This is a preparation to enable caching in the unwind library.
Note that it saves unw_addr_space_t object using thread__set_priv(). It seems currently only used by perf trace and perf kvm stat commands which don't use callchain.
--- tools/perf/util/thread.c | 6 ++++++ tools/perf/util/unwind-libunwind.c | 30 +++++++++++++++++++++++++----- tools/perf/util/unwind.h | 17 +++++++++++++++++ 3 files changed, 48 insertions(+), 5 deletions(-)
tools/perf/util/thread.c +6 -0
@@ -7,6 +7,7 @@#include "util.h" #include "debug.h" #include "comm.h" +#include "unwind.h" int thread__init_map_groups (struct thread *thread,struct machine *machine) {
@@ -37,6 +38,9 @@ struct thread *thread__new(pid_t pid, pid_t tid) thread->cpu =-1 ;INIT_LIST_HEAD (&thread->comm_list); +if (unwind__prepare_access (thread) <0 ) + goto err_thread; + comm_str =malloc (32 );if (!comm_str) goto err_thread;
@@ -48,6 +52,7 @@ struct thread *thread__new(pid_t pid, pid_t tid) goto err_thread;list_add (&comm->list, &thread->comm_list); + }return thread;
@@ -69,6 +74,7 @@ void thread__delete(struct thread *thread)list_del (&comm->list);comm__free (comm); } +unwind__finish_access (thread);free (thread); }
tools/perf/util/unwind-libunwind.c +25 -5
@@ -525,12 +525,9 @@ static unw_accessors_t accessors = { .get_proc_name = get_proc_name, }; -static int get_entries (struct unwind_info *ui,unwind_entry_cb_t cb, -void *arg,int max_stack) +int unwind__prepare_access (struct thread *thread) {unw_addr_space_t addr_space; -unw_cursor_t c; -int ret; addr_space =unw_create_addr_space (&accessors,0 );if (!addr_space) {
@@ -538,6 +535,30 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb,return -ENOMEM ; } +thread__set_priv (thread, addr_space); + +return 0 ; +} + +void unwind__finish_access (struct thread *thread) +{ +unw_addr_space_t addr_space; + + addr_space =thread__priv (thread); +unw_destroy_addr_space (addr_space); +} + +static int get_entries (struct unwind_info *ui,unwind_entry_cb_t cb, +void *arg,int max_stack) +{ +unw_addr_space_t addr_space; +unw_cursor_t c; +int ret; + + addr_space =thread__priv (ui->thread); +if (addr_space ==NULL ) +return -1 ; + ret =unw_init_remote (&c, addr_space, ui);if (ret)display_error (ret);
@@ -549,7 +570,6 @@ static int get_entries(struct unwind_info *ui, unwind_entry_cb_t cb, ret = ip ?entry (ip, ui->thread, ui->machine, cb, arg) :0 ; } -unw_destroy_addr_space (addr_space);return ret; }
tools/perf/util/unwind.h +17 -0
@@ -4,6 +4,7 @@#include <linux/types.h> #include "event.h" #include "symbol.h" +#include "thread.h" struct unwind_entry {struct map *map;
@@ -21,6 +22,15 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,/* libunwind specific */ #ifdef HAVE_LIBUNWIND_SUPPORT int libunwind__arch_reg_id (int regnum); +int unwind__prepare_access (struct thread *thread); +void unwind__finish_access (struct thread *thread); +#else +static inline int unwind__prepare_access (struct thread *thread) +{ +return 0 ; +} + +static inline void unwind__finish_access (struct thread *thread) {}#endif #else static inline int
@@ -33,5 +43,12 @@ unwind__get_entries(unwind_entry_cb_t cb __maybe_unused, {return 0 ; } + +static inline int unwind__prepare_access (struct thread *thread) +{ +return 0 ; +} + +static inline void unwind__finish_access (struct thread *thread) {}#endif /* HAVE_DWARF_UNWIND_SUPPORT */ #endif /* __UNWIND_H */
Signature · 1 line
2.1.0
Namhyung Kim
maintainerPATCH v2 2/2 perf callchain: Use global caching provided by libunwind
The libunwind provides two caching policy which are global and per-thread. As perf unwinds callchains in a single thread, it'd sufficient to use global caching.
This speeds up my perf report from 14s to 7s on a ~260MB data file. Although the output sometimes contains a slight difference (~0.01% in terms of number of lines printed) on callchains which were not resolved.
--- tools/perf/util/thread.c | 3 +++ tools/perf/util/unwind-libunwind.c | 9 +++++++++ tools/perf/util/unwind.h | 3 +++ 3 files changed, 15 insertions(+)
tools/perf/util/thread.c +3 -0
@@ -117,6 +117,9 @@ int __thread__set_comm(struct thread *thread, const char *str, u64 timestamp,if (!new)return -ENOMEM ;list_add (&new->list, &thread->comm_list); + +if (exec) +unwind__flush_access (thread); } thread->comm_set = true;
tools/perf/util/unwind-libunwind.c +9 -0
@@ -535,11 +535,20 @@ int unwind__prepare_access(struct thread *thread)return -ENOMEM ; } +unw_set_caching_policy (addr_space,UNW_CACHE_GLOBAL );thread__set_priv (thread, addr_space);return 0 ; } +void unwind__flush_access (struct thread *thread) +{ +unw_addr_space_t addr_space; + + addr_space =thread__priv (thread); +unw_flush_cache (addr_space,0 ,0 ); +} +void unwind__finish_access (struct thread *thread) {unw_addr_space_t addr_space;
tools/perf/util/unwind.h +3 -0
@@ -23,6 +23,7 @@ int unwind__get_entries(unwind_entry_cb_t cb, void *arg,#ifdef HAVE_LIBUNWIND_SUPPORT int libunwind__arch_reg_id (int regnum);int unwind__prepare_access (struct thread *thread); +void unwind__flush_access (struct thread *thread);void unwind__finish_access (struct thread *thread);#else static inline int unwind__prepare_access (struct thread *thread)
@@ -30,6 +31,7 @@ static inline int unwind__prepare_access(struct thread *thread) return 0; } +static inline void unwind__flush_access (struct thread *thread) {}static inline void unwind__finish_access (struct thread *thread) {}#endif #else
@@ -49,6 +51,7 @@ static inline int unwind__prepare_access(struct thread *thread)return 0 ; } +static inline void unwind__flush_access (struct thread *thread) {}static inline void unwind__finish_access (struct thread *thread) {}#endif /* HAVE_DWARF_UNWIND_SUPPORT */ #endif /* __UNWIND_H */
Signature · 1 line
2.1.0
Quoted 38 lines · Namhyung Kim
The
unw_addr_space_tin libunwind represents an address space to be used for stack unwinding. It doesn't need to be create/destory everytime to unwind callchain (as inget_entries) and can have a same lifetime as thread (unless exec called).So move the address space construction/destruction logic to the thread lifetime handling functions. This is a preparation to enable caching in the unwind library.
Note that it saves
unw_addr_space_tobject usingthread__set_priv(). It seems currently only used by perf trace and perf kvm stat commands which don't use callchain.Acked-by Jean Pihet <[email protected]>Cc Jiri Olsa <[email protected]>Cc Arun Sharma <[email protected]>Cc David Ahern <[email protected]>Cc Frederic Weisbecker <[email protected]>Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/thread.c | 6 ++++++ tools/perf/util/unwind-libunwind.c | 30 +++++++++++++++++++++++++----- tools/perf/util/unwind.h | 17 +++++++++++++++++ 3 files changed, 48 insertions(+), 5 deletions(-)tools/perf/util/thread.c +1
-0@@ -7,6 +7,7 @@#include "util.h" #include "debug.h" #include "comm.h" +#include "unwind.h" int thread__init_map_groups (struct thread *thread,struct machine *machine) {
tools/perf/util/thread.c struct thread *thread__new(pid_t pid, pid_t tid) · line 42
Quoted 5 lines
tools/perf/util/thread.c +2
-0@@ -37,6 +38,9 @@ struct thread *thread__new(pid_t pid, pid_t tid) thread->cpu =-1 ;INIT_LIST_HEAD (&thread->comm_list); +if (unwind__prepare_access (thread) <0 ) + goto err_thread;
So this is something we need to do only for DWARF unwind via libunwind. Do we want some condition to bypass this in for the rest of the cases?
I think we could check for symbol_conf.use_callchain and for the PERF_SAMPLE_REGS_USER|PERF_SAMPLE_STACK_USER sample types in evlist, something like:
bool has_dwarf_data_for_callchains = symbol_conf.use_callchain && evlist_sample_type_has(evlist, PERF_SAMPLE_REGS_USER|PERF_SAMPLE_STACK_USER)
;-)
thanks,
jirka
Namhyung Kim
maintainerHi Jiri,
Quoted 10 lines · Jiri Olsa
tools/perf/util/thread.c struct thread *thread__new(pid_t pid, pid_t tid) · line 42
Quoted 6 lines · Namhyung Kim
tools/perf/util/thread.c +2
-0@@ -37,6 +38,9 @@ struct thread *thread__new(pid_t pid, pid_t tid) thread->cpu =-1 ;INIT_LIST_HEAD (&thread->comm_list); +if (unwind__prepare_access (thread) <0 ) + goto err_thread;So this is something we need to do only for DWARF unwind via libunwind. Do we want some condition to bypass this in for the rest of the cases?
Ah, you're right, we need to check that before doing this.
Quoted 6 lines
I think we could check for symbol_conf.use_callchain and for the PERF_SAMPLE_REGS_USER|PERF_SAMPLE_STACK_USER sample types in evlist, something like:
bool has_dwarf_data_for_callchains = symbol_conf.use_callchain && evlist_sample_type_has(evlist, PERF_SAMPLE_REGS_USER|PERF_SAMPLE_STACK_USER)
Hmm.. it seems that it's hard to get the evlist at this point. Maybe we need to add a field in the symbol_conf or a global variable.. :/
Thanks,
Namhyung
Quoted 18 lines · Namhyung Kim
Hi Jiri,
Quoted 10 lines · Jiri Olsa
tools/perf/util/thread.c struct thread *thread__new(pid_t pid, pid_t tid) · line 42
Quoted 6 lines · Namhyung Kim
tools/perf/util/thread.c +2
-0@@ -37,6 +38,9 @@ struct thread *thread__new(pid_t pid, pid_t tid) thread->cpu =-1 ;INIT_LIST_HEAD (&thread->comm_list); +if (unwind__prepare_access (thread) <0 ) + goto err_thread;So this is something we need to do only for DWARF unwind via libunwind. Do we want some condition to bypass this in for the rest of the cases?
Ah, you're right, we need to check that before doing this.
Quoted 1 line
Quoted 8 lines
Quoted 5 lines
I think we could check for symbol_conf.use_callchain and for the PERF_SAMPLE_REGS_USER|PERF_SAMPLE_STACK_USER sample types in evlist, something like:
bool has_dwarf_data_for_callchains = symbol_conf.use_callchain && evlist_sample_type_has(evlist, PERF_SAMPLE_REGS_USER|PERF_SAMPLE_STACK_USER)Hmm.. it seems that it's hard to get the evlist at this point. Maybe we need to add a field in the
symbol_confor a global variable.. :/
yea, symbol_conf seems ok
jirka
Arnaldo Carvalho de Melo
maintainerEm Tue, Sep 30, 2014 at 03:11:21PM +0900, Namhyung Kim escreveu:
Quoted 15 lines · Jiri Olsa
Quoted 10 lines · Namhyung Kim
tools/perf/util/thread.c struct thread *thread__new(pid_t pid, pid_t tid) · line 42
Quoted 6 lines
tools/perf/util/thread.c +2
-0@@ -37,6 +38,9 @@ struct thread *thread__new(pid_t pid, pid_t tid) thread->cpu =-1 ;INIT_LIST_HEAD (&thread->comm_list); +if (unwind__prepare_access (thread) <0 ) + goto err_thread;So this is something we need to do only for DWARF unwind via libunwind. Do we want some condition to bypass this in for the rest of the cases?
Ah, you're right, we need to check that before doing this.
Quoted 8 lines
Quoted 5 lines
I think we could check for symbol_conf.use_callchain and for the PERF_SAMPLE_REGS_USER|PERF_SAMPLE_STACK_USER sample types in evlist, something like:
bool has_dwarf_data_for_callchains = symbol_conf.use_callchain && evlist_sample_type_has(evlist, PERF_SAMPLE_REGS_USER|PERF_SAMPLE_STACK_USER)Hmm.. it seems that it's hard to get the evlist at this point. Maybe we need to add a field in the
symbol_confor a global variable.. :/
Please don't export evlist in a global way, just set some flag on symbol_conf.
At some point we need to ditch even symbol_conf :-\
- Arnaldo