perf report: Ensure the perf DSO mapping matches what libdw sees
In some situations the libdw unwinder stopped working properly. I.e. with libunwind we see: ~~~~~ heaptrack_gui 2228 135073.400112: 641314 cycles: e8ed _dl_fixup (/usr/lib/ld-2.25.so) 15f06 _dl_runtime_resolve_sse_vex (/usr/lib/ld-2.25.so) ed94c KDynamicJobTracker::KDynamicJobTracker (/home/milian/projects/compiled/kf5/lib64/libKF5KIOWidgets.so.5.35.0) 608f3 _GLOBAL__sub_I_kdynamicjobtracker.cpp (/home/milian/projects/compiled/kf5/lib64/libKF5KIOWidgets.so.5.35.0) f199 call_init.part.0 (/usr/lib/ld-2.25.so) f2a5 _dl_init (/usr/lib/ld-2.25.so) db9 _dl_start_user (/usr/lib/ld-2.25.so) ~~~~~ But with libdw and without this patch this sample is not properly unwound: ~~~~~ heaptrack_gui 2228 135073.400112: 641314 cycles: e8ed _dl_fixup (/usr/lib/ld-2.25.so) 15f06 _dl_runtime_resolve_sse_vex (/usr/lib/ld-2.25.so) ed94c KDynamicJobTracker::KDynamicJobTracker (/home/milian/projects/compiled/kf5/lib64/libKF5KIOWidgets.so.5.35.0) ~~~~~ Debug output showed me that libdw found a module for the last frame address, but it thinks it belongs to /usr/lib/ld-2.25.so. This patch double-checks what libdw sees and what perf knows. If the mappings mismatch, we now report the elf known to perf. This fixes the situation above, and the libdw unwinder produces the same stack as libunwind. Signed-off-by: Milian Wolff <milian.wolff@kdab.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/20170602143753.16907-1-milian.wolff@kdab.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
5ea0416f51
commit
2538b9e245
|
@ -39,6 +39,14 @@ static int __report_module(struct addr_location *al, u64 ip,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
mod = dwfl_addrmodule(ui->dwfl, ip);
|
mod = dwfl_addrmodule(ui->dwfl, ip);
|
||||||
|
if (mod) {
|
||||||
|
Dwarf_Addr s;
|
||||||
|
|
||||||
|
dwfl_module_info(mod, NULL, &s, NULL, NULL, NULL, NULL, NULL);
|
||||||
|
if (s != al->map->start)
|
||||||
|
mod = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!mod)
|
if (!mod)
|
||||||
mod = dwfl_report_elf(ui->dwfl, dso->short_name,
|
mod = dwfl_report_elf(ui->dwfl, dso->short_name,
|
||||||
dso->long_name, -1, al->map->start,
|
dso->long_name, -1, al->map->start,
|
||||||
|
|
Loading…
Reference in New Issue