perf test: Be more tolerant of metricgroup failures
Ian Rogers
reviewerPATCH v2 1/1 perf test: Be more tolerant of metricgroup failures
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.
---
v2. Add skip if event mode isn't valid in per-thread mode. Suggested
by Veronika Molnarova <[email protected]>.
--- .../perf/tests/shell/stat_all_metricgroups.sh | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-)
tools/perf/tests/shell/stat_all_metricgroups.sh +30 -6
@@ -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
Signature · 1 line
2.45.0.rc1.225.g2a3ae87e7f-goog
Ian Rogers
reviewerQuoted 11 lines · Ian Rogers
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 <[email protected]>Signed-off-by Ian Rogers <[email protected]>---
v2. Add skip if event mode isn't valid in per-thread mode. Suggested
by Veronika Molnarova <[email protected]>.
Ping.
Thanks,
Ian
Quoted 63 lines
--- .../perf/tests/shell/stat_all_metricgroups.sh | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-)tools/perf/tests/shell/stat_all_metricgroups.sh +30
-7@@ -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
Veronika Molnarova
Acked-byQuoted 76 lines · Ian Rogers
Quoted 11 lines · Ian Rogers
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 <[email protected]>Signed-off-by Ian Rogers <[email protected]>---
v2. Add skip if event mode isn't valid in per-thread mode. Suggested
by Veronika Molnarova <[email protected]>.Ping.
Thanks,
IanQuoted 58 lines
--- .../perf/tests/shell/stat_all_metricgroups.sh | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-)tools/perf/tests/shell/stat_all_metricgroups.sh +29
-5@@ -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
Quoted 6 lines
Quoted 5 lines
tools/perf/tests/shell/stat_all_metricgroups.sh +1
-2-exit 0 +exit $err --2.45.0.rc1.225.g2a3ae87e7f-goog
Thanks,
Veronika
Quoted 6 lines · Ian Rogers
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