MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-08 10:25:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

selftests: mptcp: join: stop transfer when check is done (part 2)

Browse Source 
commit 04b57c9e09 upstream.

Since the "Fixes" commits mentioned below, the newly added "userspace
pm" subtests of mptcp_join selftests are launching the whole transfer in
the background, do the required checks, then wait for the end of
transfer.

There is no need to wait longer, especially because the checks at the
end of the transfer are ignored (which is fine). This saves quite a few
seconds on slow environments.

While at it, use 'mptcp_lib_kill_wait()' helper everywhere, instead of
on a specific one with 'kill_tests_wait()'.

Fixes: b2e2248f36 ("selftests: mptcp: userspace pm create id 0 subflow")
Fixes: e3b47e460b ("selftests: mptcp: userspace pm remove initial subflow")
Fixes: b9fb176081 ("selftests: mptcp: userspace pm send RM_ADDR for ID 0")
Cc: stable@vger.kernel.org
Reviewed-and-tested-by: Geliang Tang <geliang@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240131-upstream-net-20240131-mptcp-ci-issues-v1-9-4c1c11e571ff@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthieu Baerts (NGI0) 2024-01-31 22:49:54 +01:00 committed by Greg Kroah-Hartman
parent 6156277d1b
commit 358f02b84f
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/testing/selftests/net/mptcp/mptcp_join.sh
View File

@ -688,13 +688,6 @@ kill_events_pids()
mptcp_lib_kill_wait $evts_ns2_pid mptcp_lib_kill_wait $evts_ns2_pid
} }
kill_tests_wait()
{
#shellcheck disable=SC2046
kill -SIGUSR1 $(ip netns pids $ns2) $(ip netns pids $ns1)
wait
}
pm_nl_set_limits() pm_nl_set_limits()
{ {
local ns=$1 local ns=$1
@ -3463,7 +3456,8 @@ endpoint_tests()
pm_nl_set_limits $ns2 2 2 pm_nl_set_limits $ns2 2 2
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
speed=slow \ speed=slow \
run_tests $ns1 $ns2 10.0.1.1 2>/dev/null & run_tests $ns1 $ns2 10.0.1.1 &
local tests_pid=$!
wait_mpj $ns1 wait_mpj $ns1
pm_nl_check_endpoint "creation" \ pm_nl_check_endpoint "creation" \
@ -3478,7 +3472,7 @@ endpoint_tests()
pm_nl_add_endpoint $ns2 10.0.2.2 flags signal pm_nl_add_endpoint $ns2 10.0.2.2 flags signal
pm_nl_check_endpoint "modif is allowed" \ pm_nl_check_endpoint "modif is allowed" \
$ns2 10.0.2.2 id 1 flags signal $ns2 10.0.2.2 id 1 flags signal
kill_tests_wait mptcp_lib_kill_wait $tests_pid
fi fi
if reset "delete and re-add" && if reset "delete and re-add" &&
@ -3487,7 +3481,8 @@ endpoint_tests()
pm_nl_set_limits $ns2 1 1 pm_nl_set_limits $ns2 1 1
pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow
test_linkfail=4 speed=20 \ test_linkfail=4 speed=20 \
run_tests $ns1 $ns2 10.0.1.1 2>/dev/null & run_tests $ns1 $ns2 10.0.1.1 &
local tests_pid=$!
wait_mpj $ns2 wait_mpj $ns2
chk_subflow_nr "before delete" 2 chk_subflow_nr "before delete" 2
@ -3502,7 +3497,7 @@ endpoint_tests()
wait_mpj $ns2 wait_mpj $ns2
chk_subflow_nr "after re-add" 2 chk_subflow_nr "after re-add" 2
chk_mptcp_info subflows 1 subflows 1 chk_mptcp_info subflows 1 subflows 1
kill_tests_wait mptcp_lib_kill_wait $tests_pid
fi fi
} }