]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests: mptcp: join: endpoints: longer transfer
authorMatthieu Baerts (NGI0) <matttbe@kernel.org>
Mon, 10 Nov 2025 18:23:42 +0000 (19:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Nov 2025 09:36:04 +0000 (10:36 +0100)
commit 6457595db9870298ee30b6d75287b8548e33fe19 upstream.

In rare cases, when the test environment is very slow, some userspace
tests can fail because some expected events have not been seen.

Because the tests are expecting a long on-going connection, and they are
not waiting for the end of the transfer, it is fine to make the
connection longer. This connection will be killed at the end, after the
verifications, so making it longer doesn't change anything, apart from
avoid it to end before the end of the verifications

To play it safe, all endpoints tests not waiting for the end of the
transfer are now sharing a longer file (128KB) at slow speed.

Fixes: 69c6ce7b6eca ("selftests: mptcp: add implicit endpoint test case")
Cc: stable@vger.kernel.org
Fixes: e274f7154008 ("selftests: mptcp: add subflow limits test-cases")
Fixes: b5e2fb832f48 ("selftests: mptcp: add explicit test case for remove/readd")
Fixes: e06959e9eebd ("selftests: mptcp: join: test for flush/re-add endpoints")
Reviewed-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-3-a4332c714e10@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/testing/selftests/net/mptcp/mptcp_join.sh

index 00b6c6cd76b8fd7753598d251809e8a53b745592..f0d23c76f1cbf2be88f47f4f825f148ba388476e 100755 (executable)
@@ -3728,7 +3728,7 @@ endpoint_tests()
                pm_nl_set_limits $ns1 2 2
                pm_nl_set_limits $ns2 2 2
                pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
-               { speed=slow \
+               { test_linkfail=128 speed=slow \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
 
@@ -3755,7 +3755,7 @@ endpoint_tests()
                pm_nl_set_limits $ns2 0 3
                pm_nl_add_endpoint $ns2 10.0.1.2 id 1 dev ns2eth1 flags subflow
                pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
-               { test_linkfail=4 speed=5 \
+               { test_linkfail=128 speed=5 \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
 
@@ -3833,7 +3833,7 @@ endpoint_tests()
                # broadcast IP: no packet for this address will be received on ns1
                pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
                pm_nl_add_endpoint $ns1 10.0.1.1 id 42 flags signal
-               { test_linkfail=4 speed=5 \
+               { test_linkfail=128 speed=5 \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!
 
@@ -3906,7 +3906,7 @@ endpoint_tests()
                # broadcast IP: no packet for this address will be received on ns1
                pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
                pm_nl_add_endpoint $ns2 10.0.3.2 id 3 flags subflow
-               { test_linkfail=4 speed=20 \
+               { test_linkfail=128 speed=20 \
                        run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
                local tests_pid=$!