Commit 97802f3b authored Jun 05, 2018 by Adrian Hunter Committed by Arnaldo Carvalho de Melo Jun 06, 2018

perf map: Consider PTI entry trampolines in rip_2objdump()



perf tools uses map__rip_2objdump() to calculate objdump virtual addresses.
map__rip_2objdump() needs to be amended to deal with PTI entry trampolines.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1528183800-21577-1-git-send-email-adrian.hunter@intel.com


[ split from a larger patch ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent f6c66d73

tools/perf/util/map.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -449,6 +449,20 @@ int map__fprintf_srcline(struct map map, u64 addr, const char prefix,
		*/
		u64 map__rip_2objdump(struct map *map, u64 rip)
		{
		struct kmap *kmap = __map__kmap(map);

		/*
		* vmlinux does not have program headers for PTI entry trampolines and
		* kcore may not either. However the trampoline object code is on the
		* main kernel map, so just use that instead.
		*/
		if (kmap && is_entry_trampoline(kmap->name) && kmap->kmaps && kmap->kmaps->machine) {
		struct map *kernel_map = machine__kernel_map(kmap->kmaps->machine);

		if (kernel_map)
		map = kernel_map;
		}

		if (!map->dso->adjust_symbols)
		return rip;