selftests: mptcp: join: wait for estab event instead of MPJ

'wait_mpj' was used just after having created a background connection,
but before creating new subflows. So no MPJ were sent. The intention was
to wait for the connection to be established, which was the same as
doing a simple sleep with a "random" value.

Instead, wait for an "established" event. With this, the tests can
finish quicker.

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-9-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 e70d3420954fc13741896a6880fa75dd0e4e0ebb..ff20d86ed399a071a6c20a24a6c2b2fba773e5c3 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3999,7 +3999,7 @@ userspace_tests()
                { timeout_test=120 test_linkfail=128 speed=5 \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
-               wait_mpj $ns1
+               wait_event ns1 MPTCP_LIB_EVENT_ESTABLISHED 1
                userspace_pm_add_addr $ns1 10.0.2.1 10
                userspace_pm_add_addr $ns1 10.0.3.1 20
                chk_join_nr 2 2 2
@@ -4032,7 +4032,7 @@ userspace_tests()
                { timeout_test=120 test_linkfail=128 speed=5 \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
-               wait_mpj $ns2
+               wait_event ns2 MPTCP_LIB_EVENT_ESTABLISHED 1
                userspace_pm_add_sf $ns2 10.0.3.2 20
                chk_join_nr 1 1 1
                chk_mptcp_info subflows 1 subflows 1
@@ -4060,7 +4060,7 @@ userspace_tests()
                { timeout_test=120 test_linkfail=128 speed=5 \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
-               wait_mpj $ns2
+               wait_event ns2 MPTCP_LIB_EVENT_ESTABLISHED 1
                chk_mptcp_info subflows 0 subflows 0
                chk_subflows_total 1 1
                userspace_pm_add_sf $ns2 10.0.3.2 0
@@ -4081,7 +4081,7 @@ userspace_tests()
                { timeout_test=120 test_linkfail=128 speed=5 \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
-               wait_mpj $ns2
+               wait_event ns2 MPTCP_LIB_EVENT_ESTABLISHED 1
                userspace_pm_add_sf $ns2 10.0.3.2 20
                chk_join_nr 1 1 1
                chk_mptcp_info subflows 1 subflows 1
@@ -4105,7 +4105,7 @@ userspace_tests()
                { timeout_test=120 test_linkfail=128 speed=5 \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
-               wait_mpj $ns1
+               wait_event ns1 MPTCP_LIB_EVENT_ESTABLISHED 1
                userspace_pm_add_addr $ns1 10.0.2.1 10
                chk_join_nr 1 1 1
                chk_add_nr 1 1
@@ -4158,7 +4158,7 @@ endpoint_tests()
 {
        # subflow_rebuild_header is needed to support the implicit flag
        # userspace pm type prevents add_addr
-       if reset "implicit EP" &&
+       if reset_with_events "implicit EP" &&
           continue_if mptcp_lib_kallsyms_has "subflow_rebuild_header$"; then
                pm_nl_set_limits $ns1 2 2
                pm_nl_set_limits $ns2 2 2
@@ -4167,7 +4167,7 @@ endpoint_tests()
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
 
-               wait_mpj $ns1
+               wait_event ns2 MPTCP_LIB_EVENT_ESTABLISHED 1
                pm_nl_check_endpoint "creation" \
                        $ns2 10.0.2.2 id 1 flags implicit
                chk_mptcp_info subflows 1 subflows 1
@@ -4181,6 +4181,7 @@ endpoint_tests()
                pm_nl_check_endpoint "modif is allowed" \
                        $ns2 10.0.2.2 id 1 flags signal
                mptcp_lib_kill_group_wait $tests_pid
+               kill_events_pids
        fi
 
        if reset_with_tcp_filter "delete and re-add" ns2 10.0.3.2 REJECT OUTPUT &&
@@ -4194,7 +4195,7 @@ endpoint_tests()
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
 
-               wait_mpj $ns2
+               wait_event ns2 MPTCP_LIB_EVENT_ESTABLISHED 1
                pm_nl_check_endpoint "creation" \
                        $ns2 10.0.2.2 id 2 flags subflow dev ns2eth2
                chk_subflow_nr "before delete id 2" 2
@@ -4272,7 +4273,7 @@ endpoint_tests()
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
 
-               wait_mpj $ns2
+               wait_event ns2 MPTCP_LIB_EVENT_ESTABLISHED 1
                pm_nl_check_endpoint "creation" \
                        $ns1 10.0.2.1 id 1 flags signal
                chk_subflow_nr "before delete" 2