Commit 78a1f7cd authored Apr 04, 2023 by Ian Rogers Committed by Arnaldo Carvalho de Melo Apr 06, 2023

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>

parent 0e6aa013

tools/perf/arch/powerpc/util/sym-handling.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ void arch__post_process_probe_trace_events(struct perf_probe_event *pev,
		for (i = 0; i < ntevs; i++) {
		tev = &pev->tevs[i];
		map__for_each_symbol(map, sym, tmp) {
		if (map->unmap_ip(map, sym->start) == tev->point.address) {
		if (map__unmap_ip(map, sym->start) == tev->point.address) {
		arch__fix_tev_from_maps(pev, tev, map, sym);
		break;
		}

tools/perf/arch/s390/annotate/instructions.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ static int s390_call__parse(struct arch arch, struct ins_operands ops,
		target.addr = map__objdump_2mem(map, ops->target.addr);

		if (maps__find_ams(ms->maps, &target) == 0 &&
		map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)
		map__rip_2objdump(target.ms.map, map__map_ip(target.ms.map, target.addr)) == ops->target.addr)
		ops->target.sym = target.ms.sym;

		return 0;

tools/perf/builtin-kallsyms.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ static int __cmd_kallsyms(int argc, const char **argv)
		dso = map__dso(map);
		printf("%s: %s %s %#" PRIx64 "-%#" PRIx64 " (%#" PRIx64 "-%#" PRIx64")\n",
		symbol->name, dso->short_name, dso->long_name,
		map->unmap_ip(map, symbol->start), map->unmap_ip(map, symbol->end),
		map__unmap_ip(map, symbol->start), map__unmap_ip(map, symbol->end),
		symbol->start, symbol->end);
		}

tools/perf/builtin-kmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1024,7 +1024,7 @@ static void __print_slab_result(struct rb_root *root,

		if (sym != NULL)
		snprintf(buf, sizeof(buf), "%s+%" PRIx64 "", sym->name,
		addr - map->unmap_ip(map, sym->start));
		addr - map__unmap_ip(map, sym->start));
		else
		snprintf(buf, sizeof(buf), "%#" PRIx64 "", addr);
		printf(" %-34s \|", buf);

tools/perf/builtin-lock.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -900,7 +900,7 @@ static int get_symbol_name_offset(struct map map, struct symbol sym, u64 ip,
		return 0;
		}

		offset = map->map_ip(map, ip) - sym->start;
		offset = map__map_ip(map, ip) - sym->start;

		if (offset)
		return scnprintf(buf, size, "%s+%#lx", sym->name, offset);
		@@ -1070,7 +1070,7 @@ static int report_lock_contention_begin_event(struct evsel *evsel,
		return -ENOMEM;
		}

		addrs[filters.nr_addrs++] = kmap->unmap_ip(kmap, sym->start);
		addrs[filters.nr_addrs++] = map__unmap_ip(kmap, sym->start);
		filters.addrs = addrs;
		}
		}