selftests: forwarding: Mark performance-sensitive tests

When run on a slow machine, the scheduler traffic tests can be expected to
fail, and should be reported as XFAIL in that case. Therefore run these
tests through the perf_sensitive wrapper.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Link: https://lore.kernel.org/r/9a357f8cf34f5ececac08d43a3eb023008996035.1711464583.git.petrm@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/forwarding/sch_ets_tests.sh b/tools/testing/selftests/net/forwarding/sch_ets_tests.sh
index cdf689e99458e0932c303a1b5486d5fb56990ef2..f9d26a7911bb7b70f132748ea83f1b141ae000d8 100644 (file)
--- a/tools/testing/selftests/net/forwarding/sch_ets_tests.sh
+++ b/tools/testing/selftests/net/forwarding/sch_ets_tests.sh
@@ -199,25 +199,28 @@ ets_set_dwrr_two_bands()
 ets_test_strict()
 {
        ets_set_strict
-       ets_dwrr_test_01
-       ets_dwrr_test_12
+       xfail_on_slow ets_dwrr_test_01
+       xfail_on_slow ets_dwrr_test_12
 }
 
 ets_test_mixed()
 {
        ets_set_mixed
-       ets_dwrr_test_01
-       ets_dwrr_test_12
+       xfail_on_slow ets_dwrr_test_01
+       xfail_on_slow ets_dwrr_test_12
 }
 
 ets_test_dwrr()
 {
        ets_set_dwrr_uniform
-       ets_dwrr_test_012
+       xfail_on_slow ets_dwrr_test_012
+
        ets_set_dwrr_varying
-       ets_dwrr_test_012
+       xfail_on_slow ets_dwrr_test_012
+
        ets_change_quantum
-       ets_dwrr_test_012
+       xfail_on_slow ets_dwrr_test_012
+
        ets_set_dwrr_two_bands
-       ets_dwrr_test_01
+       xfail_on_slow ets_dwrr_test_01
 }

diff --git a/tools/testing/selftests/net/forwarding/sch_red.sh b/tools/testing/selftests/net/forwarding/sch_red.sh
index 81f31179ac8878d3728755a4a814fae866468799..17f28644568eba1d27b2110579c66542a01905ef 100755 (executable)
--- a/tools/testing/selftests/net/forwarding/sch_red.sh
+++ b/tools/testing/selftests/net/forwarding/sch_red.sh
@@ -451,35 +451,35 @@ uninstall_qdisc()
 ecn_test()
 {
        install_qdisc ecn
-       do_ecn_test $BACKLOG
+       xfail_on_slow do_ecn_test $BACKLOG
        uninstall_qdisc
 }
 
 ecn_nodrop_test()
 {
        install_qdisc ecn nodrop
-       do_ecn_nodrop_test $BACKLOG
+       xfail_on_slow do_ecn_nodrop_test $BACKLOG
        uninstall_qdisc
 }
 
 red_test()
 {
        install_qdisc
-       do_red_test $BACKLOG
+       xfail_on_slow do_red_test $BACKLOG
        uninstall_qdisc
 }
 
 red_qevent_test()
 {
        install_qdisc qevent early_drop block 10
-       do_red_qevent_test $BACKLOG
+       xfail_on_slow do_red_qevent_test $BACKLOG
        uninstall_qdisc
 }
 
 ecn_qevent_test()
 {
        install_qdisc ecn qevent mark block 10
-       do_ecn_qevent_test $BACKLOG
+       xfail_on_slow do_ecn_qevent_test $BACKLOG
        uninstall_qdisc
 }
 

diff --git a/tools/testing/selftests/net/forwarding/sch_tbf_core.sh b/tools/testing/selftests/net/forwarding/sch_tbf_core.sh
index d1f26cb7cd73b7a9e20078edefc317d044f8888e..9cd884d4a5dec1c54a51d6d8d255fe48d5dbe6b4 100644 (file)
--- a/tools/testing/selftests/net/forwarding/sch_tbf_core.sh
+++ b/tools/testing/selftests/net/forwarding/sch_tbf_core.sh
@@ -227,7 +227,7 @@ do_tbf_test()
        local nr=$(rate $t2 $t3 10)
        local nr_pct=$((100 * (nr - er) / er))
        ((-5 <= nr_pct && nr_pct <= 5))
-       check_err $? "Expected rate $(humanize $er), got $(humanize $nr), which is $nr_pct% off. Required accuracy is +-5%."
+       xfail_on_slow check_err $? "Expected rate $(humanize $er), got $(humanize $nr), which is $nr_pct% off. Required accuracy is +-5%."
 
        log_test "TC $((vlan - 10)): TBF rate ${mbit}Mbit"
 }