* [PATCH] perf tests probe_vfs_getname: Skip if no suitable line detected
@ 2025-03-04 16:30 Jakub Brnak
2025-03-07 0:40 ` Namhyung Kim
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Brnak @ 2025-03-04 16:30 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Namhyung Kim, linux-perf-users, linux-kernel
Cc: Mark Rutland, Alexander Shishkin, Jiri Olsa, Ian Rogers,
Adrian Hunter, kan.liang, mpetlan, tglozar, jbrnak
In some cases when calling function add_probe_vfs_getname, line number
can't be detected by perf probe -L getname_flags:
78 atomic_set(&result->refcnt, 1);
// one of the following lines should have line number
// but sometimes it does not because of optimization
result->uptr = filename;
result->aname = NULL;
81 audit_getname(result);
To prevent false failures, skip the affected tests
if no suitable line numbers can be detected.
Signed-off-by: Jakub Brnak <jbrnak@redhat.com>
---
tools/perf/tests/shell/lib/probe_vfs_getname.sh | 8 +++++++-
tools/perf/tests/shell/probe_vfs_getname.sh | 8 +++++++-
tools/perf/tests/shell/record+script_probe_vfs_getname.sh | 8 +++++++-
tools/perf/tests/shell/trace+probe_vfs_getname.sh | 8 +++++++-
4 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/tools/perf/tests/shell/lib/probe_vfs_getname.sh b/tools/perf/tests/shell/lib/probe_vfs_getname.sh
index 5c33ec7a5a63..89f72a4c818c 100644
--- a/tools/perf/tests/shell/lib/probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/lib/probe_vfs_getname.sh
@@ -19,8 +19,14 @@ add_probe_vfs_getname() {
result_aname_re="[[:space:]]+([[:digit:]]+)[[:space:]]+result->aname = NULL;"
line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_aname_re" | sed -r "s/$result_aname_re/\1/")
fi
+
+ if [ -z "$line" ] ; then
+ echo "Could not find probeable line"
+ return 2
+ fi
+
perf probe -q "vfs_getname=getname_flags:${line} pathname=result->name:string" || \
- perf probe $add_probe_verbose "vfs_getname=getname_flags:${line} pathname=filename:ustring"
+ perf probe $add_probe_verbose "vfs_getname=getname_flags:${line} pathname=filename:ustring" || return 1
fi
}
diff --git a/tools/perf/tests/shell/probe_vfs_getname.sh b/tools/perf/tests/shell/probe_vfs_getname.sh
index 0c5aacc446b3..9e99647fc61a 100755
--- a/tools/perf/tests/shell/probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/probe_vfs_getname.sh
@@ -12,7 +12,13 @@ skip_if_no_perf_probe || exit 2
# shellcheck source=lib/probe_vfs_getname.sh
. "$(dirname $0)"/lib/probe_vfs_getname.sh
-add_probe_vfs_getname || skip_if_no_debuginfo
+add_probe_vfs_getname
err=$?
+
+if [[ $err -ne 0 && $err -ne 2 ]]; then
+ skip_if_no_debuginfo
+ err=$?
+fi
+
cleanup_probe_vfs_getname
exit $err
diff --git a/tools/perf/tests/shell/record+script_probe_vfs_getname.sh b/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
index 5940fdc1df37..2724adc23e8f 100755
--- a/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
@@ -34,8 +34,14 @@ perf_script_filenames() {
grep -E " +touch +[0-9]+ +\[[0-9]+\] +[0-9]+\.[0-9]+: +probe:vfs_getname[_0-9]*: +\([[:xdigit:]]+\) +pathname=\"${file}\""
}
-add_probe_vfs_getname || skip_if_no_debuginfo
+add_probe_vfs_getname
err=$?
+
+if [[ $err -ne 0 && $err -ne 2 ]]; then
+ skip_if_no_debuginfo
+ err=$?
+fi
+
if [ $err -ne 0 ] ; then
exit $err
fi
diff --git a/tools/perf/tests/shell/trace+probe_vfs_getname.sh b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
index 708a13f00635..f5cc59225cf1 100755
--- a/tools/perf/tests/shell/trace+probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
@@ -25,8 +25,14 @@ trace_open_vfs_getname() {
}
-add_probe_vfs_getname || skip_if_no_debuginfo
+add_probe_vfs_getname
err=$?
+
+if [[ $err -ne 0 && $err -ne 2 ]]; then
+ skip_if_no_debuginfo
+ err=$?
+fi
+
if [ $err -ne 0 ] ; then
exit $err
fi
--
2.48.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] perf tests probe_vfs_getname: Skip if no suitable line detected
2025-03-04 16:30 [PATCH] perf tests probe_vfs_getname: Skip if no suitable line detected Jakub Brnak
@ 2025-03-07 0:40 ` Namhyung Kim
0 siblings, 0 replies; 2+ messages in thread
From: Namhyung Kim @ 2025-03-07 0:40 UTC (permalink / raw)
To: Jakub Brnak
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
linux-perf-users, linux-kernel, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Ian Rogers, Adrian Hunter, kan.liang, mpetlan, tglozar,
Masami Hiramatsu
Cc-ing Masami,
On Tue, Mar 04, 2025 at 05:30:15PM +0100, Jakub Brnak wrote:
> In some cases when calling function add_probe_vfs_getname, line number
> can't be detected by perf probe -L getname_flags:
>
> 78 atomic_set(&result->refcnt, 1);
>
> // one of the following lines should have line number
> // but sometimes it does not because of optimization
> result->uptr = filename;
> result->aname = NULL;
>
> 81 audit_getname(result);
>
> To prevent false failures, skip the affected tests
> if no suitable line numbers can be detected.
>
> Signed-off-by: Jakub Brnak <jbrnak@redhat.com>
> ---
> tools/perf/tests/shell/lib/probe_vfs_getname.sh | 8 +++++++-
> tools/perf/tests/shell/probe_vfs_getname.sh | 8 +++++++-
> tools/perf/tests/shell/record+script_probe_vfs_getname.sh | 8 +++++++-
> tools/perf/tests/shell/trace+probe_vfs_getname.sh | 8 +++++++-
> 4 files changed, 28 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/tests/shell/lib/probe_vfs_getname.sh b/tools/perf/tests/shell/lib/probe_vfs_getname.sh
> index 5c33ec7a5a63..89f72a4c818c 100644
> --- a/tools/perf/tests/shell/lib/probe_vfs_getname.sh
> +++ b/tools/perf/tests/shell/lib/probe_vfs_getname.sh
> @@ -19,8 +19,14 @@ add_probe_vfs_getname() {
> result_aname_re="[[:space:]]+([[:digit:]]+)[[:space:]]+result->aname = NULL;"
> line=$(perf probe -L getname_flags 2>&1 | grep -E "$result_aname_re" | sed -r "s/$result_aname_re/\1/")
> fi
> +
> + if [ -z "$line" ] ; then
> + echo "Could not find probeable line"
> + return 2
> + fi
> +
> perf probe -q "vfs_getname=getname_flags:${line} pathname=result->name:string" || \
> - perf probe $add_probe_verbose "vfs_getname=getname_flags:${line} pathname=filename:ustring"
> + perf probe $add_probe_verbose "vfs_getname=getname_flags:${line} pathname=filename:ustring" || return 1
> fi
> }
>
> diff --git a/tools/perf/tests/shell/probe_vfs_getname.sh b/tools/perf/tests/shell/probe_vfs_getname.sh
> index 0c5aacc446b3..9e99647fc61a 100755
> --- a/tools/perf/tests/shell/probe_vfs_getname.sh
> +++ b/tools/perf/tests/shell/probe_vfs_getname.sh
> @@ -12,7 +12,13 @@ skip_if_no_perf_probe || exit 2
> # shellcheck source=lib/probe_vfs_getname.sh
> . "$(dirname $0)"/lib/probe_vfs_getname.sh
>
> -add_probe_vfs_getname || skip_if_no_debuginfo
> +add_probe_vfs_getname
> err=$?
> +
> +if [[ $err -ne 0 && $err -ne 2 ]]; then
Shouldn't it be equal to 1?
if [ $err -eq 1 ];then
> + skip_if_no_debuginfo
> + err=$?
> +fi
Hmm.. probably better to call skip_if_no_debuginfo first so that it can
skip to call cleanup_probe_vfs_getname.
Thanks,
Namhyung
> +
> cleanup_probe_vfs_getname
> exit $err
> diff --git a/tools/perf/tests/shell/record+script_probe_vfs_getname.sh b/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
> index 5940fdc1df37..2724adc23e8f 100755
> --- a/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
> +++ b/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
> @@ -34,8 +34,14 @@ perf_script_filenames() {
> grep -E " +touch +[0-9]+ +\[[0-9]+\] +[0-9]+\.[0-9]+: +probe:vfs_getname[_0-9]*: +\([[:xdigit:]]+\) +pathname=\"${file}\""
> }
>
> -add_probe_vfs_getname || skip_if_no_debuginfo
> +add_probe_vfs_getname
> err=$?
> +
> +if [[ $err -ne 0 && $err -ne 2 ]]; then
> + skip_if_no_debuginfo
> + err=$?
> +fi
> +
> if [ $err -ne 0 ] ; then
> exit $err
> fi
> diff --git a/tools/perf/tests/shell/trace+probe_vfs_getname.sh b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
> index 708a13f00635..f5cc59225cf1 100755
> --- a/tools/perf/tests/shell/trace+probe_vfs_getname.sh
> +++ b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
> @@ -25,8 +25,14 @@ trace_open_vfs_getname() {
> }
>
>
> -add_probe_vfs_getname || skip_if_no_debuginfo
> +add_probe_vfs_getname
> err=$?
> +
> +if [[ $err -ne 0 && $err -ne 2 ]]; then
> + skip_if_no_debuginfo
> + err=$?
> +fi
> +
> if [ $err -ne 0 ] ; then
> exit $err
> fi
> --
> 2.48.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-07 0:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-04 16:30 [PATCH] perf tests probe_vfs_getname: Skip if no suitable line detected Jakub Brnak
2025-03-07 0:40 ` Namhyung Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).