selftests: mlxsw: resource_scale: Introduce traffic tests

The scale tests are currently testing two things: that some number of
instances of a given resource can actually be created; and that when an
attempt is made to create more than the supported amount, the failures are
noted and handled gracefully.

However the ability to allocate the resource does not mean that the
resource actually works when passing traffic. For that, make it possible
for a given scale to also test traffic.

Traffic test is only run on the positive leg of the scale test (no point
trying to pass traffic when the expected outcome is that the resource will
not be allocated). Traffic tests are opt-in, if a given test does not
expose it, it is not run.

To this end, delay the test cleanup until after the traffic test is run.

Signed-off-by: Petr Machata <petrm@nvidia.com>
Reviewed-by: Amit Cohen <amcohen@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh
index 22f761442bad703127463210872623f1a3091866..6d7814ba3c037213e9edda1be0d449b1cd212d9a 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/spectrum-2/resource_scale.sh
@@ -42,13 +42,21 @@ for current_test in ${TESTS:-$ALL_TESTS}; do
                # following the test setup.
                target=$(${current_test}_get_target "$should_fail")
                ${current_test}_test "$target" "$should_fail"
-               ${current_test}_cleanup
-               devlink_reload
                if [[ "$should_fail" -eq 0 ]]; then
                        log_test "'$current_test' $target"
+
+                       if ((!RET)); then
+                               tt=${current_test}_traffic_test
+                               if [[ $(type -t $tt) == "function" ]]; then
+                                       $tt "$target"
+                                       log_test "'$current_test' $target traffic test"
+                               fi
+                       fi
                else
                        log_test "'$current_test' overflow $target"
                fi
+               ${current_test}_cleanup
+               devlink_reload
                RET_FIN=$(( RET_FIN || RET ))
        done
 done

diff --git a/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh b/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh
index 12201acc00b96f40fc783c3061e09b22f4607244..a1bc93b966ae8022bbd101d19fe3a33f79f0742f 100755 (executable)
--- a/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh
+++ b/tools/testing/selftests/drivers/net/mlxsw/spectrum/resource_scale.sh
@@ -47,12 +47,21 @@ for current_test in ${TESTS:-$ALL_TESTS}; do
                        # changed following the test setup.
                        target=$(${current_test}_get_target "$should_fail")
                        ${current_test}_test "$target" "$should_fail"
-                       ${current_test}_cleanup
                        if [[ "$should_fail" -eq 0 ]]; then
                                log_test "'$current_test' [$profile] $target"
+
+                               if ((!RET)); then
+                                       tt=${current_test}_traffic_test
+                                       if [[ $(type -t $tt) == "function" ]]
+                                       then
+                                               $tt "$target"
+                                               log_test "'$current_test' [$profile] $target traffic test"
+                                       fi
+                               fi
                        else
                                log_test "'$current_test' [$profile] overflow $target"
                        fi
+                       ${current_test}_cleanup
                        RET_FIN=$(( RET_FIN || RET ))
                done
        done