summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Vuille <jpmv27@aim.com>2018-02-11 16:24:20 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-06 17:34:52 +0100
commit0ebdf0080949db2b9ddd02ee8c969954736c9f86 (patch)
treee8957e2c82745cd791ebcfdd8509fef6371762f9 /tools
parent3a1dab76b8496473fad3bce70fe526f699e0fb95 (diff)
downloadlinux-stable-0ebdf0080949db2b9ddd02ee8c969954736c9f86.tar.gz
linux-stable-0ebdf0080949db2b9ddd02ee8c969954736c9f86.tar.bz2
linux-stable-0ebdf0080949db2b9ddd02ee8c969954736c9f86.zip
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: Martin 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: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/unwind-libdw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/unwind-libdw.c b/tools/perf/util/unwind-libdw.c
index dbd9954eda4a..517c6afb2707 100644
--- a/tools/perf/util/unwind-libdw.c
+++ b/tools/perf/util/unwind-libdw.c
@@ -47,7 +47,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;