* Re: [PATCH] perf test: fix test case probe libc's inet_pton on s390x
2017-11-14 13:34 ` [PATCH] perf test: fix test case probe libc's inet_pton on s390x Arnaldo Carvalho de Melo
@ 2017-11-14 13:47 ` Arnaldo Carvalho de Melo
2017-11-14 13:55 ` Thomas-Mich Richter
2017-11-18 8:33 ` [tip:perf/core] perf test shell: Fix " tip-bot for Thomas Richter
2017-11-29 6:31 ` tip-bot for Thomas Richter
2 siblings, 1 reply; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-11-14 13:47 UTC (permalink / raw)
To: Thomas Richter; +Cc: linux-perf-users, brueckner, Linux Kernel Mailing List
Em Tue, Nov 14, 2017 at 10:34:09AM -0300, Arnaldo Carvalho de Melo escreveu:
> > Different name, same contents, need to look at the inode... ;-\
>
> Nah, lets ask the kernel how is it that it sees libc, please test the
> following, works for me:
BTW, this is what I sticked on that cset:
Committer changes:
We can't really use ldd for libc, as in some systems, such as x86_64, it
has hardlinks and then ldd sees one and the kernel the other, so grep
for libc in /proc/self/maps to get the one we'll receive from
PERF_RECORD_MMAP.
- Arnaldo
> diff --git a/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh b/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
> index 7a84d73324e3..8b3da21a08f1 100755
> --- a/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
> +++ b/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
> @@ -10,8 +10,8 @@
>
> . $(dirname $0)/lib/probe.sh
>
> -ld=$(realpath /lib64/ld*.so.* | uniq)
> -libc=$(echo $ld | sed 's/ld/libc/g')
> +libc=$(grep -w libc /proc/self/maps | head -1 | sed -r 's/.*[[:space:]](\/.*)/\1/g')
> +nm -g $libc 2>/dev/null | fgrep -q inet_pton || exit 254
>
> trace_libc_inet_pton_backtrace() {
> idx=0
> @@ -37,6 +37,9 @@ trace_libc_inet_pton_backtrace() {
> done
> }
>
> +# Check for IPv6 interface existence
> +ip a sh lo | fgrep -q inet6 || exit 2
> +
> skip_if_no_perf_probe && \
> perf probe -q $libc inet_pton && \
> trace_libc_inet_pton_backtrace
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf test: fix test case probe libc's inet_pton on s390x
2017-11-14 13:47 ` Arnaldo Carvalho de Melo
@ 2017-11-14 13:55 ` Thomas-Mich Richter
2017-11-14 14:58 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 6+ messages in thread
From: Thomas-Mich Richter @ 2017-11-14 13:55 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-perf-users, brueckner, Linux Kernel Mailing List
On 11/14/2017 02:47 PM, Arnaldo Carvalho de Melo wrote:
> Em Tue, Nov 14, 2017 at 10:34:09AM -0300, Arnaldo Carvalho de Melo escreveu:
>>> Different name, same contents, need to look at the inode... ;-\
>>
>> Nah, lets ask the kernel how is it that it sees libc, please test the
>> following, works for me:
works for me too.
>
> BTW, this is what I sticked on that cset:
>
> Committer changes:
>
> We can't really use ldd for libc, as in some systems, such as x86_64, it
> has hardlinks and then ldd sees one and the kernel the other, so grep
> for libc in /proc/self/maps to get the one we'll receive from
> PERF_RECORD_MMAP.
>
> - Arnaldo
>
Yes I am fine with this changes.
Go ahead.
--
Thomas Richter, Dept 3303, IBM LTC Boeblingen Germany
--
Vorsitzende des Aufsichtsrats: Martina Koederitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf test: fix test case probe libc's inet_pton on s390x
2017-11-14 13:55 ` Thomas-Mich Richter
@ 2017-11-14 14:58 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-11-14 14:58 UTC (permalink / raw)
To: Thomas-Mich Richter
Cc: linux-perf-users, brueckner, Linux Kernel Mailing List
Em Tue, Nov 14, 2017 at 02:55:48PM +0100, Thomas-Mich Richter escreveu:
> On 11/14/2017 02:47 PM, Arnaldo Carvalho de Melo wrote:
> > Em Tue, Nov 14, 2017 at 10:34:09AM -0300, Arnaldo Carvalho de Melo escreveu:
> >>> Different name, same contents, need to look at the inode... ;-\
> >>
> >> Nah, lets ask the kernel how is it that it sees libc, please test the
> >> following, works for me:
>
> works for me too.
>
> >
> > BTW, this is what I sticked on that cset:
> >
> > Committer changes:
> >
> > We can't really use ldd for libc, as in some systems, such as x86_64, it
> > has hardlinks and then ldd sees one and the kernel the other, so grep
> > for libc in /proc/self/maps to get the one we'll receive from
> > PERF_RECORD_MMAP.
> >
> > - Arnaldo
> >
>
> Yes I am fine with this changes.
> Go ahead.
Thanks for checking, committed.
- Arnaldo
^ permalink raw reply [flat|nested] 6+ messages in thread
* [tip:perf/core] perf test shell: Fix test case probe libc's inet_pton on s390x
2017-11-14 13:34 ` [PATCH] perf test: fix test case probe libc's inet_pton on s390x Arnaldo Carvalho de Melo
2017-11-14 13:47 ` Arnaldo Carvalho de Melo
@ 2017-11-18 8:33 ` tip-bot for Thomas Richter
2017-11-29 6:31 ` tip-bot for Thomas Richter
2 siblings, 0 replies; 6+ messages in thread
From: tip-bot for Thomas Richter @ 2017-11-18 8:33 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, brueckner, mingo, tmricht, linux-kernel, acme, hpa
Commit-ID: 0879e5e5f33c8a1eb01281ad920173664e68b266
Gitweb: https://git.kernel.org/tip/0879e5e5f33c8a1eb01281ad920173664e68b266
Author: Thomas Richter <tmricht@linux.vnet.ibm.com>
AuthorDate: Tue, 14 Nov 2017 08:18:47 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 16 Nov 2017 14:50:00 -0300
perf test shell: Fix test case probe libc's inet_pton on s390x
The 'perf test' case "probe libc's inet_pton & backtrace it with ping"
fails on s390x. The reason is the 'realpath /lib64/ld*.so.* | uniq' line
which returns 2 libraries:
root@s35lp76 shell]# realpath /lib64/ld*.so.* | uniq
/usr/lib64/ld-2.26.so
/usr/lib64/ld_pre_smc.so.1.0.1
[root@s35lp76 shell]
This output makes the "perf probe" command lines invalid.
Use ldd tool to find out the libraries required by "bash" and check if
symbol "inet_pton" is part of the "libc" library. Some distros do not
have a /lib64 directory.
I have also added a check for the existence of an IPv6 network interface
before it is being used.
Committer changes:
We can't really use ldd for libc, as in some systems, such as x86_64, it
has hardlinks and then ldd sees one and the kernel the other, so grep
for libc in /proc/self/maps to get the one we'll receive from
PERF_RECORD_MMAP.
Thomas checked this change and acked it.
Signed-off-by: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Suggested-by: Hendrik Brückner <brueckner@linux.vnet.ibm.com>
Reviewed-by: Hendrik Brückner <brueckner@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20171114133409.GN8836@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/shell/trace+probe_libc_inet_pton.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh b/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
index 7a84d73..8b3da21 100755
--- a/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
+++ b/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
@@ -10,8 +10,8 @@
. $(dirname $0)/lib/probe.sh
-ld=$(realpath /lib64/ld*.so.* | uniq)
-libc=$(echo $ld | sed 's/ld/libc/g')
+libc=$(grep -w libc /proc/self/maps | head -1 | sed -r 's/.*[[:space:]](\/.*)/\1/g')
+nm -g $libc 2>/dev/null | fgrep -q inet_pton || exit 254
trace_libc_inet_pton_backtrace() {
idx=0
@@ -37,6 +37,9 @@ trace_libc_inet_pton_backtrace() {
done
}
+# Check for IPv6 interface existence
+ip a sh lo | fgrep -q inet6 || exit 2
+
skip_if_no_perf_probe && \
perf probe -q $libc inet_pton && \
trace_libc_inet_pton_backtrace
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [tip:perf/core] perf test shell: Fix test case probe libc's inet_pton on s390x
2017-11-14 13:34 ` [PATCH] perf test: fix test case probe libc's inet_pton on s390x Arnaldo Carvalho de Melo
2017-11-14 13:47 ` Arnaldo Carvalho de Melo
2017-11-18 8:33 ` [tip:perf/core] perf test shell: Fix " tip-bot for Thomas Richter
@ 2017-11-29 6:31 ` tip-bot for Thomas Richter
2 siblings, 0 replies; 6+ messages in thread
From: tip-bot for Thomas Richter @ 2017-11-29 6:31 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, tmricht, linux-kernel, hpa, mingo, brueckner, tglx
Commit-ID: d5c5e46aa7a2b256a526f9ce832ffbf622c3c19a
Gitweb: https://git.kernel.org/tip/d5c5e46aa7a2b256a526f9ce832ffbf622c3c19a
Author: Thomas Richter <tmricht@linux.vnet.ibm.com>
AuthorDate: Tue, 14 Nov 2017 08:18:47 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 28 Nov 2017 14:23:16 -0300
perf test shell: Fix test case probe libc's inet_pton on s390x
The 'perf test' case "probe libc's inet_pton & backtrace it with ping"
fails on s390x. The reason is the 'realpath /lib64/ld*.so.* | uniq' line
which returns 2 libraries:
root@s35lp76 shell]# realpath /lib64/ld*.so.* | uniq
/usr/lib64/ld-2.26.so
/usr/lib64/ld_pre_smc.so.1.0.1
[root@s35lp76 shell]
This output makes the "perf probe" command lines invalid.
Use ldd tool to find out the libraries required by "bash" and check if
symbol "inet_pton" is part of the "libc" library. Some distros do not
have a /lib64 directory.
I have also added a check for the existence of an IPv6 network interface
before it is being used.
Committer changes:
We can't really use ldd for libc, as in some systems, such as x86_64, it
has hardlinks and then ldd sees one and the kernel the other, so grep
for libc in /proc/self/maps to get the one we'll receive from
PERF_RECORD_MMAP.
Thomas checked this change and acked it.
Signed-off-by: Thomas-Mich Richter <tmricht@linux.vnet.ibm.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Suggested-by: Hendrik Brückner <brueckner@linux.vnet.ibm.com>
Reviewed-by: Hendrik Brückner <brueckner@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20171114133409.GN8836@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/shell/trace+probe_libc_inet_pton.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh b/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
index 7a84d73..8b3da21 100755
--- a/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
+++ b/tools/perf/tests/shell/trace+probe_libc_inet_pton.sh
@@ -10,8 +10,8 @@
. $(dirname $0)/lib/probe.sh
-ld=$(realpath /lib64/ld*.so.* | uniq)
-libc=$(echo $ld | sed 's/ld/libc/g')
+libc=$(grep -w libc /proc/self/maps | head -1 | sed -r 's/.*[[:space:]](\/.*)/\1/g')
+nm -g $libc 2>/dev/null | fgrep -q inet_pton || exit 254
trace_libc_inet_pton_backtrace() {
idx=0
@@ -37,6 +37,9 @@ trace_libc_inet_pton_backtrace() {
done
}
+# Check for IPv6 interface existence
+ip a sh lo | fgrep -q inet6 || exit 2
+
skip_if_no_perf_probe && \
perf probe -q $libc inet_pton && \
trace_libc_inet_pton_backtrace
^ permalink raw reply related [flat|nested] 6+ messages in thread