| From 0529b472d53efb4868c72c2cc164051e1f9a6ce1 Mon Sep 17 00:00:00 2001 |
| From: Martin Vuille <jpmv27@aim.com> |
| Date: Sun, 11 Feb 2018 16:24:20 -0500 |
| Subject: 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> |
| --- |
| tools/perf/util/unwind-libdw.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/tools/perf/util/unwind-libdw.c |
| +++ b/tools/perf/util/unwind-libdw.c |
| @@ -47,7 +47,7 @@ static int __report_module(struct addr_l |
| |
| 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; |
