Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1fd8d9e authored Apr 26, 2018 by Arnaldo Carvalho de Melo

perf symbols: No need to special case MAP__FUNCTION in fixup

In 39b12f78 ("perf tools: Make it possible to read object code from
vmlinux") we special case MAP__FUNCTION maps inconsistently, the first
test tests the map type while the following tests added by this patch
don't do that, be consistent and elliminate this special case.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-khmi5jccpcwqa9nybefluzqp@git.kernel.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 6769e98d

tools/perf/util/sort.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ static int _hist_entry__sym_snprintf(struct map map, struct symbol sym,

		ret += repsep_snprintf(bf + ret, size - ret, "[%c] ", level);
		if (sym && map) {
		if (map->type == MAP__VARIABLE) {
		if (sym->type == STT_OBJECT) {
		ret += repsep_snprintf(bf + ret, size - ret, "%s", sym->name);
		ret += repsep_snprintf(bf + ret, size - ret, "+0x%llx",
		ip - map->unmap_ip(map, sym->start));

tools/perf/util/symbol-elf.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -921,10 +921,10 @@ int dso__load_sym(struct dso dso, struct map map, struct symsrc *syms_ss,

		dso->adjust_symbols = runtime_ss->adjust_symbols \|\| ref_reloc(kmap);
		/*
		* Initial kernel and module mappings do not map to the dso. For
		* function mappings, flag the fixups.
		* Initial kernel and module mappings do not map to the dso.
		* Flag the fixups.
		*/
		if (map->type == MAP__FUNCTION && (dso->kernel \|\| kmodule)) {
		if (dso->kernel \|\| kmodule) {
		remap_kernel = true;
		adjust_kernel_syms = dso->adjust_symbols;
		}