perf thread: Ditch __thread__find_symbol()

Simulate having all symbols in just one tree by searching the still
existing two trees.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-uss70e8tvzzbzs326330t83q@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index afec6f9ffd896b0a3eebfdf838dc5ca88954a0e8..c7effcfc40ed1c3649f0d12ac1df7fd62c10acb9 100644 (file)
--- 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 241d3c827faef4d38ad7c752a8c40ba3d31baf91..7b67771cd4783e68484bab1600d35c9681ef5100 100644 (file)
--- 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 a00e82b83e0a8e22c069e86bfceebd1eeb65154e..3422ef67ec21fd9bb00a1d9eac97bd7bc66fc0e4 100644 (file)
--- 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 d6209c73f32de3f23346d69bc8aedde61d2e8448..54aa24d6151ef180e9d8037085475ebd139610c0 100644 (file)
--- 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);