Commit 0e6aa013 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf map: Rename map_ip() and unmap_ip() 



Add dso to match comment. This avoids a naming conflict with later
added accessor functions for variables in struct map.

Signed-off-by: default avatarIan 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5a4f5be9

tools/perf/builtin-kmem.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ static u64 find_callsite(struct evsel *evsel, struct perf_sample *sample) 
		if (!caller) {

			/* found */

			if (node->ms.map)

				addr = map__unmap_ip(node->ms.map, node->ip);

				addr = map__dso_unmap_ip(node->ms.map, node->ip);

			else

				addr = node->ip;

tools/perf/builtin-script.c

+2 −2
Original line number Diff line number Diff line
@@ -1012,11 +1012,11 @@ static int perf_sample__fprintf_brstackoff(struct perf_sample *sample, 


		if (thread__find_map_fb(thread, sample->cpumode, from, &alf) &&

		    !map__dso(alf.map)->adjust_symbols)

			from = map__map_ip(alf.map, from);

			from = map__dso_map_ip(alf.map, from);



		if (thread__find_map_fb(thread, sample->cpumode, to, &alt) &&

		    !map__dso(alt.map)->adjust_symbols)

			to = map__map_ip(alt.map, to);

			to = map__dso_map_ip(alt.map, to);



		printed += fprintf(fp, " 0x%"PRIx64, from);

		if (PRINT_FIELD(DSO)) {

tools/perf/util/machine.c

+2 −2
Original line number Diff line number Diff line
@@ -3058,7 +3058,7 @@ static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms 
	if (!symbol_conf.inline_name || !map || !sym)

		return ret;



	addr = map__map_ip(map, ip);

	addr = map__dso_map_ip(map, ip);

	addr = map__rip_2objdump(map, addr);

	dso = map__dso(map);
@@ -3103,7 +3103,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) 
	 * its corresponding binary.

	 */

	if (entry->ms.map)

		addr = map__map_ip(entry->ms.map, entry->ip);

		addr = map__dso_map_ip(entry->ms.map, entry->ip);



	srcline = callchain_srcline(&entry->ms, addr);

	return callchain_cursor_append(cursor, entry->ip, &entry->ms,

tools/perf/util/map.c

+4 −4
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ void map__init(struct map *map, u64 start, u64 end, u64 pgoff, struct dso *dso) 
	map->pgoff    = pgoff;

	map->reloc    = 0;

	map->dso      = dso__get(dso);

	map->map_ip   = map__map_ip;

	map->unmap_ip = map__unmap_ip;

	map->map_ip   = map__dso_map_ip;

	map->unmap_ip = map__dso_unmap_ip;

	map->erange_warned = false;

	refcount_set(&map->refcnt, 1);

}
@@ -590,12 +590,12 @@ struct maps *map__kmaps(struct map *map) 
	return kmap->kmaps;

}



u64 map__map_ip(const struct map *map, u64 ip)

u64 map__dso_map_ip(const struct map *map, u64 ip)

{

	return ip - map__start(map) + map->pgoff;

}



u64 map__unmap_ip(const struct map *map, u64 ip)

u64 map__dso_unmap_ip(const struct map *map, u64 ip)

{

	return ip + map__start(map) - map->pgoff;

}

tools/perf/util/map.h

+2 −2
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ struct kmap *map__kmap(struct map *map); 
struct maps *map__kmaps(struct map *map);



/* ip -> dso rip */

u64 map__map_ip(const struct map *map, u64 ip);

u64 map__dso_map_ip(const struct map *map, u64 ip);

/* dso rip -> ip */

u64 map__unmap_ip(const struct map *map, u64 ip);

u64 map__dso_unmap_ip(const struct map *map, u64 ip);

/* Returns ip */

u64 identity__map_ip(const struct map *map __maybe_unused, u64 ip);