mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-27 04:22:58 +00:00
perf map: Add helper for ->map_ip() and ->unmap_ip()
Later changes will add reference count checking for struct map, add a helper function to invoke the map_ip and unmap_ip function pointers. The helper allows the reference count check to be in fewer places. Committer notes: Add missing conversions to: tools/perf/util/map.c tools/perf/util/cs-etm.c tools/perf/util/annotate.c tools/perf/arch/powerpc/util/sym-handling.c tools/perf/arch/s390/annotate/instructions.c Signed-off-by: Ian Rogers <irogers@google.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Darren Hart <dvhart@infradead.org> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: Dmitriy Vyukov <dvyukov@google.com> Cc: Eric Dumazet <edumazet@google.com> Cc: German Gomez <german.gomez@arm.com> Cc: Hao Luo <haoluo@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: John Garry <john.g.garry@oracle.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Madhavan Srinivasan <maddy@linux.ibm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Miaoqian Lin <linmq006@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Riccardo Mancini <rickyman7@gmail.com> Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com> Cc: Song Liu <song@kernel.org> Cc: Stephane Eranian <eranian@google.com> Cc: Stephen Brennan <stephen.s.brennan@oracle.com> Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Yury Norov <yury.norov@gmail.com> Link: https://lore.kernel.org/r/20230404205954.2245628-2-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
committed by
Arnaldo Carvalho de Melo
parent
0e6aa013bb
commit
78a1f7cd90
@@ -487,7 +487,7 @@ size_t perf_event__fprintf_text_poke(union perf_event *event, struct machine *ma
|
||||
|
||||
al.map = maps__find(machine__kernel_maps(machine), tp->addr);
|
||||
if (al.map && map__load(al.map) >= 0) {
|
||||
al.addr = al.map->map_ip(al.map, tp->addr);
|
||||
al.addr = map__map_ip(al.map, tp->addr);
|
||||
al.sym = map__find_symbol(al.map, al.addr);
|
||||
if (al.sym)
|
||||
ret += symbol__fprintf_symname_offs(al.sym, &al, fp);
|
||||
@@ -622,7 +622,7 @@ struct map *thread__find_map(struct thread *thread, u8 cpumode, u64 addr,
|
||||
*/
|
||||
if (load_map)
|
||||
map__load(al->map);
|
||||
al->addr = al->map->map_ip(al->map, al->addr);
|
||||
al->addr = map__map_ip(al->map, al->addr);
|
||||
}
|
||||
|
||||
return al->map;
|
||||
@@ -743,12 +743,12 @@ int machine__resolve(struct machine *machine, struct addr_location *al,
|
||||
}
|
||||
if (!ret && al->sym) {
|
||||
snprintf(al_addr_str, sz, "0x%"PRIx64,
|
||||
al->map->unmap_ip(al->map, al->sym->start));
|
||||
map__unmap_ip(al->map, al->sym->start));
|
||||
ret = strlist__has_entry(symbol_conf.sym_list,
|
||||
al_addr_str);
|
||||
}
|
||||
if (!ret && symbol_conf.addr_list && al->map) {
|
||||
unsigned long addr = al->map->unmap_ip(al->map, al->addr);
|
||||
unsigned long addr = map__unmap_ip(al->map, al->addr);
|
||||
|
||||
ret = intlist__has_entry(symbol_conf.addr_list, addr);
|
||||
if (!ret && symbol_conf.addr_range) {
|
||||
|
||||
Reference in New Issue
Block a user