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

Commit 2b0aa312 authored by Martin Vuille's avatar Martin Vuille Committed by Greg Kroah-Hartman
Browse files

perf unwind: Unwind with libdw doesn't take symfs into account 



[ Upstream commit 3d20c6246690219881786de10d2dda93f616d0ac ]

Path passed to libdw for unwinding doesn't include symfs path
if specified, so unwinding fails because ELF file is not found.

Similar to unwinding with libunwind, pass symsrc_filename instead
of long_name. If there is no symsrc_filename, fallback to long_name.

Signed-off-by: default avatarMartin Vuille <jpmv27@aim.com>
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: http://lkml.kernel.org/r/20180211212420.18388-1-jpmv27@aim.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c13c2a5b

tools/perf/util/unwind-libdw.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int __report_module(struct addr_location *al, u64 ip, 


	if (!mod)

		mod = dwfl_report_elf(ui->dwfl, dso->short_name,

				      dso->long_name, -1, al->map->start,

				      (dso->symsrc_filename ? dso->symsrc_filename : dso->long_name), -1, al->map->start,

				      false);



	return mod && dwfl_addrmodule(ui->dwfl, ip) == mod ? 0 : -1;