Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Adrian Hunter and committed by
Arnaldo Carvalho de Melo
97802f3b f6c66d73

+14
+14
tools/perf/util/map.c
··· 449 449 */ 450 450 u64 map__rip_2objdump(struct map *map, u64 rip) 451 451 { 452 + struct kmap *kmap = __map__kmap(map); 453 + 454 + /* 455 + * vmlinux does not have program headers for PTI entry trampolines and 456 + * kcore may not either. However the trampoline object code is on the 457 + * main kernel map, so just use that instead. 458 + */ 459 + if (kmap && is_entry_trampoline(kmap->name) && kmap->kmaps && kmap->kmaps->machine) { 460 + struct map *kernel_map = machine__kernel_map(kmap->kmaps->machine); 461 + 462 + if (kernel_map) 463 + map = kernel_map; 464 + } 465 + 452 466 if (!map->dso->adjust_symbols) 453 467 return rip; 454 468