perf script: Show correct offsets for DWARF-based unwinding
PATCH 1/1 perf script: Show correct offsets for DWARF-based unwinding
When perf data is recorded with the dwarf call-graph option, the callchain shown by perf script still shows the binary offsets of the userspace symbols instead of their virtual addresses. Since the symbol offset calculation is based on using virtual address as the ip, we see incorrect offsets as well.
The use of virtual addresses affects the ability to find out the line number in the corresponding source file to which an address maps to as described in commit 67540759151a ("perf unwind: Use addr_location::addr instead of ip for entries").
This has also been addressed by temporarily converting the virtual address to the correponding binary offset so that it can be mapped to the source line number correctly.
This is a follow-up for commit 19610184693c ("perf script: Show virtual addresses instead of offsets").
This can be verified on a powerpc64le system running Fedora 27 as shown below:
# perf probe -x /usr/lib64/libc-2.26.so -a inet_pton # perf record -e probe_libc:inet_pton --call-graph=dwarf ping -6 -c 1 ::1
Before:
# perf report --stdio --no-children -s sym,srcline -g address
# Samples: 1 of event 'probe_libc:inet_pton'
# Event count (approx.): 1
#
# Overhead Symbol Source:Line
# ........ .................... ...........
#
100.00% [.] __GI___inet_pton inet_pton.c
|
---gaih_inet getaddrinfo.c:537 (inlined)
__GI_getaddrinfo getaddrinfo.c:2304 (inlined)
main ping.c:519
generic_start_main libc-start.c:308 (inlined)
__libc_start_main libc-start.c:102...
# perf script -F comm,ip,sym,symoff,srcline,dso
ping
15af28 __GI___inet_pton+0xffff000099160008 (/usr/lib64/libc-2.26.so)
libc-2.26.so[ffff80004ca0af28]
10fa53 gaih_inet+0xffff000099160f43
libc-2.26.so[ffff80004c9bfa53] (inlined)
1105b3 __GI_getaddrinfo+0xffff000099160163
libc-2.26.so[ffff80004c9c05b3] (inlined)
2d6f main+0xfffffffd9f1003df (/usr/bin/ping)
ping[fffffffecf882d6f]
2369f generic_start_main+0xffff00009916013f
libc-2.26.so[ffff80004c8d369f] (inlined)
23897 __libc_start_main+0xffff0000991600b7 (/usr/lib64/libc-2.26.so)
libc-2.26.so[ffff80004c8d3897]After:
# perf report --stdio --no-children -s sym,srcline -g address
# Samples: 1 of event 'probe_libc:inet_pton'
# Event count (approx.): 1
#
# Overhead Symbol Source:Line
# ........ .................... ...........
#
100.00% [.] __GI___inet_pton inet_pton.c
|
---gaih_inet.constprop.7 getaddrinfo.c:537
getaddrinfo getaddrinfo.c:2304
main ping.c:519
generic_start_main.isra.0 libc-start.c:308
__libc_start_main libc-start.c:102...
# perf script -F comm,ip,sym,symoff,srcline,dso
ping
7fffb38aaf28 __GI___inet_pton+0x8 (/usr/lib64/libc-2.26.so)
inet_pton.c:68
7fffb385fa53 gaih_inet.constprop.7+0xf43 (/usr/lib64/libc-2.26.so)
getaddrinfo.c:537
7fffb38605b3 getaddrinfo+0x163 (/usr/lib64/libc-2.26.so)
getaddrinfo.c:2304
130782d6f main+0x3df (/usr/bin/ping)
ping.c:519
7fffb377369f generic_start_main.isra.0+0x13f (/usr/lib64/libc-2.26.so)
libc-start.c:308
7fffb3773897 __libc_start_main+0xb7 (/usr/lib64/libc-2.26.so)
libc-start.c:102--- tools/perf/util/machine.c | 9 ++++++++- tools/perf/util/unwind-libdw.c | 2 +- tools/perf/util/unwind-libunwind-local.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-)
tools/perf/util/machine.c +8 -1
@@ -2272,6 +2272,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) {struct callchain_cursor *cursor = arg;const char *srcline =NULL ; +u64 addr;if (symbol_conf.hide_unresolved && entry->sym ==NULL )return 0 ;
@@ -2279,7 +2280,13 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)if (append_inlines (cursor, entry->map, entry->sym, entry->ip) ==0 )return 0 ; - srcline =callchain_srcline (entry->map, entry->sym, entry->ip); +/* +* Convert entry->ip from a virtual address to an offset in +* its corresponding binary. +*/ + addr =map__map_ip (entry->map, entry->ip); + + srcline =callchain_srcline (entry->map, entry->sym, addr);return callchain_cursor_append (cursor, entry->ip, entry->map, entry->sym, false,NULL ,0 ,0 ,0 , srcline);
tools/perf/util/unwind-libdw.c +1 -1
@@ -77,7 +77,7 @@ static int entry(u64 ip, struct unwind_info *ui)if (__report_module (&al, ip, ui))return -1 ; - e->ip = al.addr; + e->ip = ip; e->map = al.map; e->sym = al.sym;
tools/perf/util/unwind-libunwind-local.c +1 -1
@@ -575,7 +575,7 @@ static int entry(u64 ip, struct thread *thread,struct addr_location al; e.sym =thread__find_symbol (thread,PERF_RECORD_MISC_USER , ip, &al); - e.ip = al.addr; + e.ip = ip; e.map = al.map; pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",
Signature · 1 line
2.14.4
On Tue, Jul 03, 2018 at 05:35:55PM +0530, Sandipan Das wrote:
SNIP
Quoted 36 lines
After:
# perf report --stdio --no-children -s sym,srcline -g address# Samples: 1 of event 'probe_libc:inet_pton'
# Event count (approx.): 1
## Overhead Symbol Source:Line # ........ .................... ........... # 100.00% [.] __GI___inet_pton inet_pton.c | ---gaih_inet.constprop.7 getaddrinfo.c:537 getaddrinfo getaddrinfo.c:2304 main ping.c:519 generic_start_main.isra.0 libc-start.c:308 __libc_start_main libc-start.c:102...
# perf script -F comm,ip,sym,symoff,srcline,dsoping
7fffb38aaf28 __GI___inet_pton+0x8 (/usr/lib64/libc-2.26.so) inet_pton.c:68 7fffb385fa53 gaih_inet.constprop.7+0xf43 (/usr/lib64/libc-2.26.so) getaddrinfo.c:537 7fffb38605b3 getaddrinfo+0x163 (/usr/lib64/libc-2.26.so) getaddrinfo.c:2304 130782d6f main+0x3df (/usr/bin/ping) ping.c:519 7fffb377369f generic_start_main.isra.0+0x13f (/usr/lib64/libc-2.26.so) libc-start.c:308 7fffb3773897 __libc_start_main+0xb7 (/usr/lib64/libc-2.26.so) libc-start.c:102
Quoted 2 lines
Fixes 67540759151a ("perf unwind: Use addr_location::addr instead of ip for entries")Signed-off-by Sandipan Das <[email protected]>
looks good to me, Milian?
thanks,
jirka
Quoted 54 lines · On Montag, 9. Juli 2018 16:25:07 CEST Jiri Olsa wrote:
On Tue, Jul 03, 2018 at 05:35:55PM +0530, Sandipan Das wrote:
SNIP
Quoted 50 lines
After:
# perf report --stdio --no-children -s sym,srcline -g address# Samples: 1 of event 'probe_libc:inet_pton'
# Event count (approx.): 1
## Overhead Symbol Source:Line # ........ .................... ...........#
100.00% [.] __GI___inet_pton inet_pton.c ---gaih_inet.constprop.7 getaddrinfo.c:537 getaddrinfo getaddrinfo.c:2304 main ping.c:519 generic_start_main.isra.0 libc-start.c:308 __libc_start_main libc-start.c:102...
# perf script -F comm,ip,sym,symoff,srcline,dsoping
7fffb38aaf28 __GI___inet_pton+0x8 (/usr/lib64/libc-2.26.so) inet_pton.c:68 7fffb385fa53 gaih_inet.constprop.7+0xf43 (/usr/lib64/libc-2.26.so) getaddrinfo.c:537 7fffb38605b3 getaddrinfo+0x163 (/usr/lib64/libc-2.26.so) getaddrinfo.c:2304 130782d6f main+0x3df (/usr/bin/ping) ping.c:519 7fffb377369f generic_start_main.isra.0+0x13f (/usr/lib64/libc-2.26.so) libc-start.c:308 7fffb3773897 __libc_start_main+0xb7 (/usr/lib64/libc-2.26.so)
Quoted 8 lines
Quoted 4 lines
libc-start.c:102Fixes 67540759151a ("perf unwind: Use addr_location::addr instead of ipfor entries") Signed-off-by: Sandipan Das <[email protected]>
looks good to me, Milian?
Acked-by Jiri Olsa <[email protected]>
Sorry for the delay, I was on vacation.
The above looks somewhat strange to me - why is there no (inlined) suffix visible anymore?
Also, I can't test this patch locally, since - even without this patch - inline frame resolution with perf seems to be completely broken for me. It doesn't seem to be a perf regression - going back in time doesn't resole this
- but rather of its dependencies or even of the DWARF emitted by the compilers I have available to test...
Cheers
Signature · 4 lines
Milian Wolff | [email protected] | Senior Software Engineer KDAB (Deutschland) GmbH, a KDAB Group company Tel: +49-30-521325470 KDAB - The Qt, C++ and OpenGL Experts
tip-bot for Sandipan Das
merge botperf script: Show correct offsets for DWARF-based unwinding
Commit-ID: 2a9d5050dc84fa2060f08a52f632976923e0fa7e Gitweb: https://git.kernel.org/tip/2a9d5050dc84fa2060f08a52f632976923e0fa7e Author: Sandipan Das <[email protected]> AuthorDate: Tue, 3 Jul 2018 17:35:55 +0530 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 24 Jul 2018 14:53:11 -0300
perf script: Show correct offsets for DWARF-based unwinding
When perf/data is recorded with the dwarf call-graph option, the callchain shown by 'perf script' still shows the binary offsets of the userspace symbols instead of their virtual addresses. Since the symbol offset calculation is based on using virtual address as the ip, we see incorrect offsets as well.
The use of virtual addresses affects the ability to find out the line number in the corresponding source file to which an address maps to as described in commit 67540759151a ("perf unwind: Use addr_location::addr instead of ip for entries").
This has also been addressed by temporarily converting the virtual address to the correponding binary offset so that it can be mapped to the source line number correctly.
This is a follow-up for commit 19610184693c ("perf script: Show virtual addresses instead of offsets").
This can be verified on a powerpc64le system running Fedora 27 as shown below:
# perf probe -x /usr/lib64/libc-2.26.so -a inet_pton # perf record -e probe_libc:inet_pton --call-graph=dwarf ping -6 -c 1 ::1
Before:
# perf report --stdio --no-children -s sym,srcline -g address
# Samples: 1 of event 'probe_libc:inet_pton'
# Event count (approx.): 1
#
# Overhead Symbol Source:Line
# ........ .................... ...........
#
100.00% [.] __GI___inet_pton inet_pton.c
|
---gaih_inet getaddrinfo.c:537 (inlined)
__GI_getaddrinfo getaddrinfo.c:2304 (inlined)
main ping.c:519
generic_start_main libc-start.c:308 (inlined)
__libc_start_main libc-start.c:102...
# perf script -F comm,ip,sym,symoff,srcline,dso
ping
15af28 __GI___inet_pton+0xffff000099160008 (/usr/lib64/libc-2.26.so)
libc-2.26.so[ffff80004ca0af28]
10fa53 gaih_inet+0xffff000099160f43
libc-2.26.so[ffff80004c9bfa53] (inlined)
1105b3 __GI_getaddrinfo+0xffff000099160163
libc-2.26.so[ffff80004c9c05b3] (inlined)
2d6f main+0xfffffffd9f1003df (/usr/bin/ping)
ping[fffffffecf882d6f]
2369f generic_start_main+0xffff00009916013f
libc-2.26.so[ffff80004c8d369f] (inlined)
23897 __libc_start_main+0xffff0000991600b7 (/usr/lib64/libc-2.26.so)
libc-2.26.so[ffff80004c8d3897]After:
# perf report --stdio --no-children -s sym,srcline -g address
# Samples: 1 of event 'probe_libc:inet_pton'
# Event count (approx.): 1
#
# Overhead Symbol Source:Line
# ........ .................... ...........
#
100.00% [.] __GI___inet_pton inet_pton.c
|
---gaih_inet.constprop.7 getaddrinfo.c:537
getaddrinfo getaddrinfo.c:2304
main ping.c:519
generic_start_main.isra.0 libc-start.c:308
__libc_start_main libc-start.c:102...
# perf script -F comm,ip,sym,symoff,srcline,dso
ping
7fffb38aaf28 __GI___inet_pton+0x8 (/usr/lib64/libc-2.26.so)
inet_pton.c:68
7fffb385fa53 gaih_inet.constprop.7+0xf43 (/usr/lib64/libc-2.26.so)
getaddrinfo.c:537
7fffb38605b3 getaddrinfo+0x163 (/usr/lib64/libc-2.26.so)
getaddrinfo.c:2304
130782d6f main+0x3df (/usr/bin/ping)
ping.c:519
7fffb377369f generic_start_main.isra.0+0x13f (/usr/lib64/libc-2.26.so)
libc-start.c:308
7fffb3773897 __libc_start_main+0xb7 (/usr/lib64/libc-2.26.so)
libc-start.c:102--- tools/perf/util/machine.c | 9 ++++++++- tools/perf/util/unwind-libdw.c | 2 +- tools/perf/util/unwind-libunwind-local.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-)
tools/perf/util/machine.c +8 -1
@@ -2272,6 +2272,7 @@ static int unwind_entry(struct unwind_entry *entry, void *arg) {struct callchain_cursor *cursor = arg;const char *srcline =NULL ; +u64 addr;if (symbol_conf.hide_unresolved && entry->sym ==NULL )return 0 ;
@@ -2279,7 +2280,13 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)if (append_inlines (cursor, entry->map, entry->sym, entry->ip) ==0 )return 0 ; - srcline =callchain_srcline (entry->map, entry->sym, entry->ip); +/* +* Convert entry->ip from a virtual address to an offset in +* its corresponding binary. +*/ + addr =map__map_ip (entry->map, entry->ip); + + srcline =callchain_srcline (entry->map, entry->sym, addr);return callchain_cursor_append (cursor, entry->ip, entry->map, entry->sym, false,NULL ,0 ,0 ,0 , srcline);
tools/perf/util/unwind-libdw.c +1 -1
@@ -77,7 +77,7 @@ static int entry(u64 ip, struct unwind_info *ui)if (__report_module (&al, ip, ui))return -1 ; - e->ip = al.addr; + e->ip = ip; e->map = al.map; e->sym = al.sym;
tools/perf/util/unwind-libunwind-local.c +1 -1
@@ -575,7 +575,7 @@ static int entry(u64 ip, struct thread *thread,struct addr_location al; e.sym =thread__find_symbol (thread,PERF_RECORD_MISC_USER , ip, &al); - e.ip = al.addr; + e.ip = ip; e.map = al.map; pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",