* [PATCH v2] perf test: Be more tolerant of metricgroup failures
@ 2024-05-02 22:31 Ian Rogers
2024-09-23 18:51 ` Ian Rogers
2024-09-25 22:40 ` Namhyung Kim
0 siblings, 2 replies; 4+ messages in thread
From: Ian Rogers @ 2024-05-02 22:31 UTC (permalink / raw)
To: Veronika Molnarova, Peter Zijlstra, Ingo Molnar,
Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Ian Rogers, Adrian Hunter, Athira Rajeev,
linux-perf-users, linux-kernel
Previously "set -e" meant any non-zero exit code from perf stat would
cause a test failure. As a non-zero exit happens when there aren't
sufficient permissions, check for this case and make the exit code
2/skip for it.
Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Ian Rogers <irogers@google.com>
---
v2. Add skip if event mode isn't valid in per-thread mode. Suggested
by Veronika Molnarova <vmolnaro@redhat.com>.
---
.../perf/tests/shell/stat_all_metricgroups.sh | 36 +++++++++++++++----
1 file changed, 30 insertions(+), 6 deletions(-)
diff --git a/tools/perf/tests/shell/stat_all_metricgroups.sh b/tools/perf/tests/shell/stat_all_metricgroups.sh
index 55ef9c9ded2d..c6d61a4ac3e7 100755
--- a/tools/perf/tests/shell/stat_all_metricgroups.sh
+++ b/tools/perf/tests/shell/stat_all_metricgroups.sh
@@ -1,9 +1,7 @@
-#!/bin/sh
+#!/bin/bash
# perf all metricgroups test
# SPDX-License-Identifier: GPL-2.0
-set -e
-
ParanoidAndNotRoot()
{
[ "$(id -u)" != 0 ] && [ "$(cat /proc/sys/kernel/perf_event_paranoid)" -gt $1 ]
@@ -14,11 +12,37 @@ if ParanoidAndNotRoot 0
then
system_wide_flag=""
fi
-
+err=0
for m in $(perf list --raw-dump metricgroups)
do
echo "Testing $m"
- perf stat -M "$m" $system_wide_flag sleep 0.01
+ result=$(perf stat -M "$m" $system_wide_flag sleep 0.01 2>&1)
+ result_err=$?
+ if [[ $result_err -gt 0 ]]
+ then
+ if [[ "$result" =~ \
+ "Access to performance monitoring and observability operations is limited" ]]
+ then
+ echo "Permission failure"
+ echo $result
+ if [[ $err -eq 0 ]]
+ then
+ err=2 # Skip
+ fi
+ elif [[ "$result" =~ "in per-thread mode, enable system wide" ]]
+ then
+ echo "Permissions - need system wide mode"
+ echo $result
+ if [[ $err -eq 0 ]]
+ then
+ err=2 # Skip
+ fi
+ else
+ echo "Metric group $m failed"
+ echo $result
+ err=1 # Fail
+ fi
+ fi
done
-exit 0
+exit $err
--
2.45.0.rc1.225.g2a3ae87e7f-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] perf test: Be more tolerant of metricgroup failures
2024-05-02 22:31 [PATCH v2] perf test: Be more tolerant of metricgroup failures Ian Rogers
@ 2024-09-23 18:51 ` Ian Rogers
2024-09-24 16:41 ` Veronika Molnarova
2024-09-25 22:40 ` Namhyung Kim
1 sibling, 1 reply; 4+ messages in thread
From: Ian Rogers @ 2024-09-23 18:51 UTC (permalink / raw)
To: Veronika Molnarova, Peter Zijlstra, Ingo Molnar,
Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Ian Rogers, Adrian Hunter, Athira Rajeev,
linux-perf-users, linux-kernel
On Thu, May 2, 2024 at 3:31 PM Ian Rogers <irogers@google.com> wrote:
>
> Previously "set -e" meant any non-zero exit code from perf stat would
> cause a test failure. As a non-zero exit happens when there aren't
> sufficient permissions, check for this case and make the exit code
> 2/skip for it.
>
> Acked-by: Namhyung Kim <namhyung@kernel.org>
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> v2. Add skip if event mode isn't valid in per-thread mode. Suggested
> by Veronika Molnarova <vmolnaro@redhat.com>.
Ping.
Thanks,
Ian
> ---
> .../perf/tests/shell/stat_all_metricgroups.sh | 36 +++++++++++++++----
> 1 file changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/tests/shell/stat_all_metricgroups.sh b/tools/perf/tests/shell/stat_all_metricgroups.sh
> index 55ef9c9ded2d..c6d61a4ac3e7 100755
> --- a/tools/perf/tests/shell/stat_all_metricgroups.sh
> +++ b/tools/perf/tests/shell/stat_all_metricgroups.sh
> @@ -1,9 +1,7 @@
> -#!/bin/sh
> +#!/bin/bash
> # perf all metricgroups test
> # SPDX-License-Identifier: GPL-2.0
>
> -set -e
> -
> ParanoidAndNotRoot()
> {
> [ "$(id -u)" != 0 ] && [ "$(cat /proc/sys/kernel/perf_event_paranoid)" -gt $1 ]
> @@ -14,11 +12,37 @@ if ParanoidAndNotRoot 0
> then
> system_wide_flag=""
> fi
> -
> +err=0
> for m in $(perf list --raw-dump metricgroups)
> do
> echo "Testing $m"
> - perf stat -M "$m" $system_wide_flag sleep 0.01
> + result=$(perf stat -M "$m" $system_wide_flag sleep 0.01 2>&1)
> + result_err=$?
> + if [[ $result_err -gt 0 ]]
> + then
> + if [[ "$result" =~ \
> + "Access to performance monitoring and observability operations is limited" ]]
> + then
> + echo "Permission failure"
> + echo $result
> + if [[ $err -eq 0 ]]
> + then
> + err=2 # Skip
> + fi
> + elif [[ "$result" =~ "in per-thread mode, enable system wide" ]]
> + then
> + echo "Permissions - need system wide mode"
> + echo $result
> + if [[ $err -eq 0 ]]
> + then
> + err=2 # Skip
> + fi
> + else
> + echo "Metric group $m failed"
> + echo $result
> + err=1 # Fail
> + fi
> + fi
> done
>
> -exit 0
> +exit $err
> --
> 2.45.0.rc1.225.g2a3ae87e7f-goog
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] perf test: Be more tolerant of metricgroup failures
2024-09-23 18:51 ` Ian Rogers
@ 2024-09-24 16:41 ` Veronika Molnarova
0 siblings, 0 replies; 4+ messages in thread
From: Veronika Molnarova @ 2024-09-24 16:41 UTC (permalink / raw)
To: Ian Rogers, Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Adrian Hunter, Athira Rajeev, linux-perf-users, linux-kernel
On 9/23/24 20:51, Ian Rogers wrote:
> On Thu, May 2, 2024 at 3:31 PM Ian Rogers <irogers@google.com> wrote:
>>
>> Previously "set -e" meant any non-zero exit code from perf stat would
>> cause a test failure. As a non-zero exit happens when there aren't
>> sufficient permissions, check for this case and make the exit code
>> 2/skip for it.
>>
>> Acked-by: Namhyung Kim <namhyung@kernel.org>
>> Signed-off-by: Ian Rogers <irogers@google.com>
>> ---
>> v2. Add skip if event mode isn't valid in per-thread mode. Suggested
>> by Veronika Molnarova <vmolnaro@redhat.com>.
>
> Ping.
>
> Thanks,
> Ian
>
>> ---
>> .../perf/tests/shell/stat_all_metricgroups.sh | 36 +++++++++++++++----
>> 1 file changed, 30 insertions(+), 6 deletions(-)
>>
>> diff --git a/tools/perf/tests/shell/stat_all_metricgroups.sh b/tools/perf/tests/shell/stat_all_metricgroups.sh
>> index 55ef9c9ded2d..c6d61a4ac3e7 100755
>> --- a/tools/perf/tests/shell/stat_all_metricgroups.sh
>> +++ b/tools/perf/tests/shell/stat_all_metricgroups.sh
>> @@ -1,9 +1,7 @@
>> -#!/bin/sh
>> +#!/bin/bash
>> # perf all metricgroups test
>> # SPDX-License-Identifier: GPL-2.0
>>
>> -set -e
>> -
>> ParanoidAndNotRoot()
>> {
>> [ "$(id -u)" != 0 ] && [ "$(cat /proc/sys/kernel/perf_event_paranoid)" -gt $1 ]
>> @@ -14,11 +12,37 @@ if ParanoidAndNotRoot 0
>> then
>> system_wide_flag=""
>> fi
>> -
>> +err=0
>> for m in $(perf list --raw-dump metricgroups)
>> do
>> echo "Testing $m"
>> - perf stat -M "$m" $system_wide_flag sleep 0.01
>> + result=$(perf stat -M "$m" $system_wide_flag sleep 0.01 2>&1)
>> + result_err=$?
>> + if [[ $result_err -gt 0 ]]
>> + then
>> + if [[ "$result" =~ \
>> + "Access to performance monitoring and observability operations is limited" ]]
>> + then
>> + echo "Permission failure"
>> + echo $result
>> + if [[ $err -eq 0 ]]
>> + then
>> + err=2 # Skip
>> + fi
>> + elif [[ "$result" =~ "in per-thread mode, enable system wide" ]]
>> + then
>> + echo "Permissions - need system wide mode"
>> + echo $result
>> + if [[ $err -eq 0 ]]
>> + then
>> + err=2 # Skip
>> + fi
>> + else
>> + echo "Metric group $m failed"
>> + echo $result
>> + err=1 # Fail
>> + fi
>> + fi
>> done
>>
>> -exit 0
>> +exit $err
>> --
>> 2.45.0.rc1.225.g2a3ae87e7f-goog
>>
>
Acked-by: Veronika Molnarova <vmolnaro@redhat.com>
Thanks,
Veronika
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] perf test: Be more tolerant of metricgroup failures
2024-05-02 22:31 [PATCH v2] perf test: Be more tolerant of metricgroup failures Ian Rogers
2024-09-23 18:51 ` Ian Rogers
@ 2024-09-25 22:40 ` Namhyung Kim
1 sibling, 0 replies; 4+ messages in thread
From: Namhyung Kim @ 2024-09-25 22:40 UTC (permalink / raw)
To: Veronika Molnarova, Peter Zijlstra, Ingo Molnar,
Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Adrian Hunter, Athira Rajeev, linux-perf-users,
linux-kernel, Ian Rogers
On Thu, 02 May 2024 15:31:15 -0700, Ian Rogers wrote:
> Previously "set -e" meant any non-zero exit code from perf stat would
> cause a test failure. As a non-zero exit happens when there aren't
> sufficient permissions, check for this case and make the exit code
> 2/skip for it.
>
>
Applied to perf-tools-next, thanks!
Best regards,
Namhyung
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-25 22:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-02 22:31 [PATCH v2] perf test: Be more tolerant of metricgroup failures Ian Rogers
2024-09-23 18:51 ` Ian Rogers
2024-09-24 16:41 ` Veronika Molnarova
2024-09-25 22: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).