selftests: mptcp: join: endpoints: longer transfer

[ Upstream commit 6457595db9870298ee30b6d75287b8548e33fe19 ]

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>
[ removed curly braces and stderr redirection ]
Signed-off-by: Sasha Levin <sashal@kernel.org>
[ Conflicts in mptcp_join.sh because commit 0c93af1f8907 ("selftests:
  mptcp: drop test_linkfail parameter") is not in this version. It moved
  the 4th parameter to an env var. To fix the conflicts, the new value
  simply needs to be added as the 4th argument instead of an env var. ]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index e435e30e0d93567fe5061b044ce8d86be757c1f3..9f73297b69da7d0403d064ae55e715894f5cbdd6 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -3313,7 +3313,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
-               run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow 2>/dev/null &
+               run_tests $ns1 $ns2 10.0.1.1 128 0 0 slow 2>/dev/null &
 
                wait_mpj $ns1
                pm_nl_check_endpoint 1 "creation" \
@@ -3336,7 +3336,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
-               run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_5 2>/dev/null &
+               run_tests $ns1 $ns2 10.0.1.1 128 0 0 speed_5 2>/dev/null &
                local tests_pid=$!
 
                wait_mpj $ns2
@@ -3401,7 +3401,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
-               run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_5 2>/dev/null &
+               run_tests $ns1 $ns2 10.0.1.1 128 0 0 speed_5 2>/dev/null &
                local tests_pid=$!
 
                wait_mpj $ns2
@@ -3464,7 +3464,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
-               run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_20 2>/dev/null &
+               run_tests $ns1 $ns2 10.0.1.1 128 0 0 speed_20 2>/dev/null &
                local tests_pid=$!
 
                wait_attempt_fail $ns2