]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
selftests: mptcp: add chk_sublfow in diag.sh
authorGang Yan <yangang@kylinos.cn>
Fri, 2 May 2025 12:29:27 +0000 (14:29 +0200)
committerJakub Kicinski <kuba@kernel.org>
Mon, 5 May 2025 23:52:00 +0000 (16:52 -0700)
This patch aims to add chk_dump_subflow in diag.sh. The subflow's
info can be obtained through "ss -tin", then use the 'mptcp_diag'
to verify the token in subflow_info.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/524
Co-developed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Gang Yan <yangang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250502-net-next-mptcp-sft-inc-cover-v1-7-68eec95898fb@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
tools/testing/selftests/net/mptcp/diag.sh

index e7a75341f0f32304ff4e58c9b2500d405124dc74..7a3cb4c09e450f0ae570015c4724ec268c6dc19f 100755 (executable)
@@ -225,6 +225,37 @@ chk_dump_one()
        fi
 }
 
+chk_dump_subflow()
+{
+       local inet_diag_token
+       local subflow_line
+       local ss_output
+       local ss_token
+       local msg
+
+       ss_output=$(ss -tniN $ns)
+
+       subflow_line=$(echo "$ss_output" | \
+                      grep -m1 -Eo '[0-9.]+:[0-9].+ +[0-9.]+:[0-9.]+')
+
+       ss_token=$(echo "$ss_output" | grep -m1 -Eo 'token:[^ ]+')
+
+       inet_diag_token=$(ip netns exec $ns ./mptcp_diag -s "$subflow_line" | \
+                         grep -Eo 'token:[^ ]+')
+
+       msg="....chk dump_subflow"
+
+       mptcp_lib_print_title "$msg"
+       if [ -n "$ss_token" ] && [ "$ss_token" = "$inet_diag_token" ]; then
+               mptcp_lib_pr_ok
+               mptcp_lib_result_pass "${msg}"
+       else
+               mptcp_lib_pr_fail "expected $ss_token found $inet_diag_token"
+               mptcp_lib_result_fail "${msg}"
+               ret=${KSFT_FAIL}
+       fi
+}
+
 msk_info_get_value()
 {
        local port="${1}"
@@ -316,6 +347,7 @@ chk_msk_fallback_nr 0 "....chk no fallback"
 chk_msk_inuse 2
 chk_msk_cestab 2
 chk_dump_one
+chk_dump_subflow
 flush_pids
 
 chk_msk_inuse 0 "2->0"