selftests: mptcp: join: no SKIP mark for group checks

When executing the last MPTCP selftests on older kernels, this output is
printed:

  # 001 no JOIN
  #       join Rx                             [SKIP]
  #       join Tx                             [SKIP]
  #       fallback                            [SKIP]

In fact, behind each line, a few counters are checked, and likely not
all of them have been skipped because the they are not available on
these kernels. Instead, "new" and unsupported counters for these groups
are now ignored, and [ OK ] will be printed instead of [SKIP].

Note that on the MPTCP CI, when validating the dev versions, any
unsupported counter will cause the tests to fail. So this is safe not to
print 'SKIP' for these group checks.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260203-net-next-mptcp-misc-feat-6-20-v1-15-31ec8bfc56d1@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 0f9253d607c3ce29c2412301122ebb3fc6201857..dc1f200aaa81db8edbd9a21a4bc69707b07a569f 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1402,7 +1402,7 @@ chk_join_tx_nr()
 
        count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynTxCreatSkErr")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$create" ]; then
                rc=${KSFT_FAIL}
                print_check "syn tx create socket error"
@@ -1411,7 +1411,7 @@ chk_join_tx_nr()
 
        count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynTxBindErr")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$bind" ]; then
                rc=${KSFT_FAIL}
                print_check "syn tx bind error"
@@ -1420,7 +1420,7 @@ chk_join_tx_nr()
 
        count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynTxConnectErr")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$connect" ]; then
                rc=${KSFT_FAIL}
                print_check "syn tx connect error"
@@ -1446,7 +1446,7 @@ chk_fallback_nr()
 
        count=$(mptcp_lib_get_counter ${!ns} "MPTcpExtInfiniteMapTx")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$infinite_map_tx" ]; then
                rc=${KSFT_FAIL}
                print_check "$ns infinite map tx fallback"
@@ -1455,7 +1455,7 @@ chk_fallback_nr()
 
        count=$(mptcp_lib_get_counter ${!ns} "MPTcpExtDSSCorruptionFallback")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$dss_corruption" ]; then
                rc=${KSFT_FAIL}
                print_check "$ns dss corruption fallback"
@@ -1464,7 +1464,7 @@ chk_fallback_nr()
 
        count=$(mptcp_lib_get_counter ${!ns} "MPTcpExtSimultConnectFallback")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$simult_conn" ]; then
                rc=${KSFT_FAIL}
                print_check "$ns simult conn fallback"
@@ -1473,7 +1473,7 @@ chk_fallback_nr()
 
        count=$(mptcp_lib_get_counter ${!ns} "MPTcpExtMPCapableFallbackACK")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$mpc_passive" ]; then
                rc=${KSFT_FAIL}
                print_check "$ns mpc passive fallback"
@@ -1482,7 +1482,7 @@ chk_fallback_nr()
 
        count=$(mptcp_lib_get_counter ${!ns} "MPTcpExtMPCapableFallbackSYNACK")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$mpc_active" ]; then
                rc=${KSFT_FAIL}
                print_check "$ns mpc active fallback"
@@ -1491,7 +1491,7 @@ chk_fallback_nr()
 
        count=$(mptcp_lib_get_counter ${!ns} "MPTcpExtMPCapableDataFallback")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$mpc_data" ]; then
                rc=${KSFT_FAIL}
                print_check "$ns mpc data fallback"
@@ -1500,7 +1500,7 @@ chk_fallback_nr()
 
        count=$(mptcp_lib_get_counter ${!ns} "MPTcpExtMD5SigFallback")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$md5_sig" ]; then
                rc=${KSFT_FAIL}
                print_check "$ns MD5 Sig fallback"
@@ -1509,7 +1509,7 @@ chk_fallback_nr()
 
        count=$(mptcp_lib_get_counter ${!ns} "MPTcpExtDssFallback")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$dss" ]; then
                rc=${KSFT_FAIL}
                print_check "$ns dss fallback"
@@ -1585,7 +1585,7 @@ chk_join_nr()
 
        count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtMPJoinSynAckHMacFailure")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "0" ]; then
                rc=${KSFT_FAIL}
                print_check "synack HMAC"
@@ -1594,7 +1594,7 @@ chk_join_nr()
 
        count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinAckRx")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$ack_nr" ]; then
                rc=${KSFT_FAIL}
                print_check "ack rx"
@@ -1603,7 +1603,7 @@ chk_join_nr()
 
        count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinAckHMacFailure")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "0" ]; then
                rc=${KSFT_FAIL}
                print_check "ack HMAC"
@@ -1612,7 +1612,7 @@ chk_join_nr()
 
        count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtMPJoinRejected")
        if [ -z "$count" ]; then
-               rc=${KSFT_SKIP}
+               : # ignore skip
        elif [ "$count" != "$syn_rej" ]; then
                rc=${KSFT_FAIL}
                print_check "syn rejected"