]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests: mptcp: join: allow more time to send ADD_ADDR
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>
Sun, 7 Sep 2025 15:32:44 +0000 (17:32 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Nov 2025 20:37:18 +0000 (15:37 -0500)
[ Upstream commit e2cda6343bfe459c3331db5afcd675ab333112dd ]

When many ADD_ADDR need to be sent, it can take some time to send each
of them, and create new subflows. Some CIs seem to occasionally have
issues with these tests, especially with "debug" kernels.

Two subtests will now run for a slightly longer time: the last two where
3 or more ADD_ADDR are sent during the test.

Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250907-net-next-mptcp-add_addr-retrans-adapt-v1-3-824cc805772b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/net/mptcp/mptcp_join.sh

index 5579709c3653349d537756440c02589d3156487a..725f1a00bbf19a6f41e7a05512c49d6b9909552f 100755 (executable)
@@ -2151,7 +2151,8 @@ signal_address_tests()
                pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
                pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
                pm_nl_set_limits $ns2 3 3
-               run_tests $ns1 $ns2 10.0.1.1
+               speed=slow \
+                       run_tests $ns1 $ns2 10.0.1.1
                chk_join_nr 3 3 3
                chk_add_nr 3 3
        fi
@@ -2163,7 +2164,8 @@ signal_address_tests()
                pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
                pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
                pm_nl_set_limits $ns2 3 3
-               run_tests $ns1 $ns2 10.0.1.1
+               speed=slow \
+                       run_tests $ns1 $ns2 10.0.1.1
                join_syn_tx=3 \
                        chk_join_nr 1 1 1
                chk_add_nr 3 3