Skip to content

Commit e2b0d01

Browse files
matttbejfvogel
authored andcommitted
selftests: mptcp: join: userspace: longer transfer
commit 290493078b96ce2ce3e60f55c23654acb678042a 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 userspace tests not waiting for the end of the transfer are now sharing a longer file (128KB) at slow speed. Fixes: 4369c19 ("selftests: mptcp: test userspace pm out of transfer") Cc: stable@vger.kernel.org Fixes: b2e2248 ("selftests: mptcp: userspace pm create id 0 subflow") Fixes: e3b47e4 ("selftests: mptcp: userspace pm remove initial subflow") Fixes: b9fb176 ("selftests: mptcp: userspace pm send RM_ADDR for ID 0") 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-4-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 6d44dd3a0ae4e957167d820c2de93d0d0f8201f2) Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
1 parent 45d94be commit e2b0d01

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3591,7 +3591,7 @@ userspace_tests()
35913591
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
35923592
set_userspace_pm $ns1
35933593
pm_nl_set_limits $ns2 2 2
3594-
{ speed=5 \
3594+
{ test_linkfail=128 speed=5 \
35953595
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
35963596
local tests_pid=$!
35973597
wait_mpj $ns1
@@ -3624,7 +3624,7 @@ userspace_tests()
36243624
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
36253625
set_userspace_pm $ns2
36263626
pm_nl_set_limits $ns1 0 1
3627-
{ speed=5 \
3627+
{ test_linkfail=128 speed=5 \
36283628
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
36293629
local tests_pid=$!
36303630
wait_mpj $ns2
@@ -3652,7 +3652,7 @@ userspace_tests()
36523652
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
36533653
set_userspace_pm $ns2
36543654
pm_nl_set_limits $ns1 0 1
3655-
{ speed=5 \
3655+
{ test_linkfail=128 speed=5 \
36563656
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
36573657
local tests_pid=$!
36583658
wait_mpj $ns2
@@ -3673,7 +3673,7 @@ userspace_tests()
36733673
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
36743674
set_userspace_pm $ns2
36753675
pm_nl_set_limits $ns1 0 1
3676-
{ speed=5 \
3676+
{ test_linkfail=128 speed=5 \
36773677
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
36783678
local tests_pid=$!
36793679
wait_mpj $ns2
@@ -3697,7 +3697,7 @@ userspace_tests()
36973697
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
36983698
set_userspace_pm $ns1
36993699
pm_nl_set_limits $ns2 1 1
3700-
{ speed=5 \
3700+
{ test_linkfail=128 speed=5 \
37013701
run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null
37023702
local tests_pid=$!
37033703
wait_mpj $ns1

0 commit comments

Comments
 (0)