mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

perf thread: Introduce thread__find_symbol()

Browse source 
Out of thread__find_addr_location(..., MAP__FUNCTION, ...), idea here is to
continue removing references to MAP__{FUNCTION,VARIABLE} ahead of
getting both types of symbols in the same rbtree, as various places do
two lookups, looking first at MAP__FUNCTION, then at MAP__VARIABLE.

So thread__find_symbol() will eventually do just that, and 'struct
symbol' will have the symbol type, for code that cares about that.

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-n7528en9e08yd3flzmb26tth@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2018-04-24 11:24:49 -03:00
parent ea40b6d322
commit 4546263d72
9 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/perf/arch/powerpc/util/skip-callchain-idx.c
View file

@ -248,8 +248,7 @@ int arch_skip_callchain_idx(struct thread *thread, struct ip_callchain *chain)
ip = chain->ips[2];
thread__find_addr_location(thread, PERF_RECORD_MISC_USER,
MAP__FUNCTION, ip, &al);
thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);
if (al.map)
dso = al.map->dso;

3
tools/perf/builtin-timechart.c
View file

@ -533,8 +533,7 @@ static const char *cat_backtrace(union perf_event *event,
}
tal.filtered = 0;
thread__find_addr_location(al.thread, cpumode,
MAP__FUNCTION, ip, &tal);
thread__find_symbol(al.thread, cpumode, ip, &tal);
if (tal.sym)
fprintf(f, "..... %016" PRIx64 " %s\n", ip,

9
tools/perf/builtin-trace.c
View file

@ -2024,8 +2024,7 @@ static int trace__pgfault(struct trace *trace,
if (trace->summary_only)
goto out;
thread__find_addr_location(thread, sample->cpumode, MAP__FUNCTION,
sample->ip, &al);
thread__find_symbol(thread, sample->cpumode, sample->ip, &al);
trace__fprintf_entry_head(trace, thread, 0, true, sample->time, trace->output);
@ -2037,12 +2036,10 @@ static int trace__pgfault(struct trace *trace,
fprintf(trace->output, "] => ");
thread__find_addr_location(thread, sample->cpumode, MAP__VARIABLE,
sample->addr, &al);
__thread__find_symbol(thread, sample->cpumode, MAP__VARIABLE, sample->addr, &al);
if (!al.map) {
thread__find_addr_location(thread, sample->cpumode,
MAP__FUNCTION, sample->addr, &al);
thread__find_symbol(thread, sample->cpumode, sample->addr, &al);
if (al.map)
map_type = 'x';

6
tools/perf/util/event.c
View file

@ -1564,9 +1564,9 @@ void __thread__find_map(struct thread *thread, u8 cpumode, enum map_type type,
}
}
void thread__find_addr_location(struct thread *thread,
u8 cpumode, enum map_type type, u64 addr,
struct addr_location *al)
void __thread__find_symbol(struct thread *thread, u8 cpumode,
enum map_type type, u64 addr,
struct addr_location *al)
{
__thread__find_map(thread, cpumode, type, addr, al);
if (al->map != NULL)

7
tools/perf/util/machine.c
View file

@ -1681,14 +1681,14 @@ static void ip__resolve_data(struct thread *thread,
memset(&al, 0, sizeof(al));
thread__find_addr_location(thread, m, MAP__VARIABLE, addr, &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_addr_location(thread, m, MAP__FUNCTION, addr, &al);
thread__find_symbol(thread, m, addr, &al);
}
ams->addr = addr;
@ -1784,8 +1784,7 @@ static int add_callchain_ip(struct thread *thread,
}
return 0;
}
thread__find_addr_location(thread, *cpumode, MAP__FUNCTION,
ip, &al);
thread__find_symbol(thread, *cpumode, ip, &al);
}
if (al.sym != NULL) {

2
tools/perf/util/thread.c
View file

@ -384,7 +384,7 @@ void thread__find_cpumode_addr_location(struct thread *thread,
};
for (i = 0; i < ARRAY_SIZE(cpumodes); i++) {
thread__find_addr_location(thread, cpumodes[i], type, addr, al);
__thread__find_symbol(thread, cpumodes[i], type, addr, al);
if (al->map)
break;
}

11
tools/perf/util/thread.h
View file

@ -101,9 +101,14 @@ static inline void thread__find_map(struct thread *thread, u8 cpumode,
__thread__find_map(thread, cpumode, MAP__FUNCTION, addr, al);
}
void thread__find_addr_location(struct thread *thread,
u8 cpumode, enum map_type type, u64 addr,
struct addr_location *al);
void __thread__find_symbol(struct thread *thread, u8 cpumode, enum map_type type,
u64 addr, struct addr_location *al);
static inline void thread__find_symbol(struct thread *thread, u8 cpumode,
u64 addr, struct addr_location *al)
{
return __thread__find_symbol(thread, cpumode, MAP__FUNCTION, addr, al);
}
void thread__find_cpumode_addr_location(struct thread *thread,
enum map_type type, u64 addr,

9
tools/perf/util/unwind-libdw.c
View file

@ -28,10 +28,11 @@ static int __report_module(struct addr_location *al, u64 ip,
{
Dwfl_Module *mod;
struct dso *dso = NULL;
thread__find_addr_location(ui->thread,
PERF_RECORD_MISC_USER,
MAP__FUNCTION, ip, al);
/*
* Some callers will use al->sym, so we can't just use the
* cheaper thread__find_map() here.
*/
thread__find_symbol(ui->thread, PERF_RECORD_MISC_USER, ip, al);
if (al->map)
dso = al->map->dso;

3
tools/perf/util/unwind-libunwind-local.c
View file

@ -585,8 +585,7 @@ static int entry(u64 ip, struct thread *thread,
struct unwind_entry e;
struct addr_location al;
thread__find_addr_location(thread, PERF_RECORD_MISC_USER,
MAP__FUNCTION, ip, &al);
thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);
e.ip = al.addr;
e.map = al.map;