Skip to content

Commit 54d3aac

Browse files
matttbejfvogel
authored andcommitted
selftests: mptcp: join: endpoints: longer transfer
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: 69c6ce7 ("selftests: mptcp: add implicit endpoint test case") Cc: stable@vger.kernel.org Fixes: e274f71 ("selftests: mptcp: add subflow limits test-cases") Fixes: b5e2fb8 ("selftests: mptcp: add explicit test case for remove/readd") Fixes: e06959e ("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> (cherry picked from commit ce01b8f0055edad55fcca07df306d0deba5ae6dd) Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
1 parent 6b9cdcd commit 54d3aac

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/testing/selftests/net/mptcp/mptcp_join.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3728,7 +3728,7 @@ endpoint_tests()
37283728
pm_nl_set_limits $ns1 2 2
37293729
pm_nl_set_limits $ns2 2 2
37303730
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
3731-
{ speed=slow \
3731+
{ test_linkfail=128 speed=slow \
37323732
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
37333733
local tests_pid=$!
37343734

@@ -3755,7 +3755,7 @@ endpoint_tests()
37553755
pm_nl_set_limits $ns2 0 3
37563756
pm_nl_add_endpoint $ns2 10.0.1.2 id 1 dev ns2eth1 flags subflow
37573757
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
3758-
{ test_linkfail=4 speed=5 \
3758+
{ test_linkfail=128 speed=5 \
37593759
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
37603760
local tests_pid=$!
37613761

@@ -3833,7 +3833,7 @@ endpoint_tests()
38333833
# broadcast IP: no packet for this address will be received on ns1
38343834
pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
38353835
pm_nl_add_endpoint $ns1 10.0.1.1 id 42 flags signal
3836-
{ test_linkfail=4 speed=5 \
3836+
{ test_linkfail=128 speed=5 \
38373837
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
38383838
local tests_pid=$!
38393839

@@ -3906,7 +3906,7 @@ endpoint_tests()
39063906
# broadcast IP: no packet for this address will be received on ns1
39073907
pm_nl_add_endpoint $ns1 224.0.0.1 id 2 flags signal
39083908
pm_nl_add_endpoint $ns2 10.0.3.2 id 3 flags subflow
3909-
{ test_linkfail=4 speed=20 \
3909+
{ test_linkfail=128 speed=20 \
39103910
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
39113911
local tests_pid=$!
39123912

0 commit comments

Comments
 (0)