From: Arnaldo Carvalho de Melo <[email protected]> Simulate having all symbols in just one tree by searching the still existing two trees.
Cc: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Wang Nan <[email protected]> Link: https://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> --- tools/perf/builtin-trace.c | 2 +- tools/perf/util/event.c | 8 ++++---- tools/perf/util/machine.c | 10 +--------- tools/perf/util/thread.h | 10 ++-------- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index afec6f9ffd89..c7effcfc40ed 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2036,7 +2036,7 @@ static int trace__pgfault(struct trace *trace, fprintf(trace->output, "] => "); - __thread__find_symbol(thread, sample->cpumode, MAP__VARIABLE, sample->addr, &al); + thread__find_symbol(thread, sample->cpumode, sample->addr, &al); if (!al.map) { thread__find_symbol(thread, sample->cpumode, sample->addr, &al); diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 241d3c827fae..7b67771cd478 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -1565,12 +1565,12 @@ struct map *__thread__find_map(struct thread *thread, u8 cpumode, enum map_type return al->map; } -struct symbol *__thread__find_symbol(struct thread *thread, u8 cpumode, - enum map_type type, u64 addr, - struct addr_location *al) +struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode, + u64 addr, struct addr_location *al) { al->sym = NULL; - if (__thread__find_map(thread, cpumode, type, addr, al)) + if (__thread__find_map(thread, cpumode, MAP__FUNCTION, addr, al) || + __thread__find_map(thread, cpumode, MAP__VARIABLE, addr, al)) al->sym = map__find_symbol(al->map, al->addr); return al->sym; } diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index a00e82b83e0a..3422ef67ec21 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1677,15 +1677,7 @@ static void ip__resolve_data(struct thread *thread, memset(&al, 0, sizeof(al)); - __thread__find_symbol(thread, m, MAP__VARIABLE, addr, &al); - if (al.map == NULL) { - /* - * some shared data regions have execute bit set which puts - * their mapping in the MAP__FUNCTION type array. - * Check there as a fallback option before dropping the sample. - */ - thread__find_symbol(thread, m, addr, &al); - } + thread__find_symbol(thread, m, addr, &al); ams->addr = addr; ams->al_addr = al.addr; diff --git a/tools/perf/util/thread.h b/tools/perf/util/thread.h index d6209c73f32d..54aa24d6151e 100644 --- a/tools/perf/util/thread.h +++ b/tools/perf/util/thread.h @@ -101,14 +101,8 @@ static inline struct map *thread__find_map(struct thread *thread, u8 cpumode, return __thread__find_map(thread, cpumode, MAP__FUNCTION, addr, al); } -struct symbol *__thread__find_symbol(struct thread *thread, u8 cpumode, enum map_type type, - u64 addr, struct addr_location *al); - -static inline struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode, - u64 addr, struct addr_location *al) -{ - return __thread__find_symbol(thread, cpumode, MAP__FUNCTION, addr, al); -} +struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode, + u64 addr, struct addr_location *al); void thread__find_cpumode_addr_location(struct thread *thread, u64 addr, struct addr_location *al); -- 2.14.3
