Skip to contentSkip to conversation

perf/test: Fix perf test 84 on s390

PATCH New Thomas Richter 1 participant 2 messages Dec 13, 2022 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 perf/test: Fix perf test 84 on s390

perf test '84: probe libc's inet_pton & backtrace it with ping' fails on s390. Debugging revealed a changed stack trace for the ping command using probes:

ping 35729 [002] 8006.365063: probe_libc:inet_pton: (3ff9603e7c0)

                  13e7c0 __GI___inet_pton+0x0 (/usr/lib64/libc.so.6)
          --->    104371 text_to_binary_address+0xef1 (inlined)
                  104371 gaih_inet+0xef1 (inlined)
                  104371 __GI_getaddrinfo+0xef1 (inlined)
                    5d4b main+0x139b (/usr/bin/ping)

The line ---> text_to_binary_address ...
is new. It was introduced with glibc version 2.36.7.2 released with Fedora 37 for s390.

Output before

 # ./perf test 84
 84: probe libc's inet_pton & backtrace it with ping   : FAILED!
 #

Output after:

 # ./perf test 84
 84: probe libc's inet_pton & backtrace it with ping   : Ok
 #
---
 tools/perf/tests/shell/record+probe_libc_inet_pton.sh | 1 +
 1 file changed, 1 insertion(+)
tools/perf/tests/shell/record+probe_libc_inet_pton.sh +1 -0
index f12a4e217968..0f01c62cbee9 100755
@@ -37,6 +37,7 @@ trace_libc_inet_pton_backtrace() {
 	case "$(uname -m)" in
 	s390x)
 		eventattr='call-graph=dwarf,max-stack=4'
+		echo "text_to_binary_address.*\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" >> $expected
 		echo "gaih_inet.*\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" >> $expected
 		echo "(__GI_)?getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" >> $expected
 		echo "main\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" >> $expected
Signature · 1 line
2.38.1
#1 lore raw

PATCH 2/2 perf/test: Fix perf test 89 on x86

From: Thomas Richter <[email protected]>

perf test '89: probe libc's inet_pton & backtrace it with ping' fails on x86. Debugging revealed a changed stack trace for the ping command using probes:

ping 35729 [002] 8006.365063: probe_libc:inet_pton: (3ff9603e7c0)

                  12be50 __GI___inet_pton+0x0 (/usr/lib64/libc.so.6)
                  4fca main+0x139b (/usr/bin/ping)

The line getaddrinfo.... in the call stack is gone. It was introduced with glibc version 2.36.8 released with Fedora 37.

Output before on x86

 # ./perf test 89
 89: probe libc's inet_pton & backtrace it with ping   : FAILED!
 #

Output after on x86:

 # ./perf test 89
 89: probe libc's inet_pton & backtrace it with ping   : Ok
 #
---
 tools/perf/tests/shell/record+probe_libc_inet_pton.sh | 1 -
 1 file changed, 1 deletion(-)
tools/perf/tests/shell/record+probe_libc_inet_pton.sh +0 -1
index 0f01c62cbee9..51ae8b906055 100755
@@ -50,7 +50,6 @@ trace_libc_inet_pton_backtrace() {
 		;;
 	*)
 		eventattr='max-stack=3'
-		echo "getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" >> $expected
 		echo ".*(\+0x[[:xdigit:]]+|\[unknown\])[[:space:]]\(.*/bin/ping.*\)$" >> $expected
 		;;
 	esac
Signature · 1 line
2.38.1