Commit 04b57c9e authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski
Browse files

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



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: b2e2248f ("selftests: mptcp: userspace pm create id 0 subflow")
Fixes: e3b47e46 ("selftests: mptcp: userspace pm remove initial subflow")
Fixes: b9fb1760 ("selftests: mptcp: userspace pm send RM_ADDR for ID 0")
Cc: stable@vger.kernel.org
Reviewed-and-tested-by: default avatarGeliang Tang <geliang@kernel.org>
Signed-off-by: default avatarMatthieu 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: default avatarJakub Kicinski <kuba@kernel.org>
parent 31ee4ad8

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

+9 −14
Original line number Diff line number Diff line
@@ -643,13 +643,6 @@ kill_events_pids() 
	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()

{

	local ns=$1
@@ -3494,7 +3487,7 @@ userspace_tests() 
		chk_mptcp_info subflows 1 subflows 1

		chk_subflows_total 2 2

		kill_events_pids

		wait $tests_pid

		mptcp_lib_kill_wait $tests_pid

	fi



	# userspace pm remove initial subflow
@@ -3518,7 +3511,7 @@ userspace_tests() 
		chk_mptcp_info subflows 1 subflows 1

		chk_subflows_total 1 1

		kill_events_pids

		wait $tests_pid

		mptcp_lib_kill_wait $tests_pid

	fi



	# userspace pm send RM_ADDR for ID 0
@@ -3544,7 +3537,7 @@ userspace_tests() 
		chk_mptcp_info subflows 1 subflows 1

		chk_subflows_total 1 1

		kill_events_pids

		wait $tests_pid

		mptcp_lib_kill_wait $tests_pid

	fi

}
@@ -3558,7 +3551,8 @@ endpoint_tests() 
		pm_nl_set_limits $ns2 2 2

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal

		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

		pm_nl_check_endpoint "creation" \
@@ -3573,7 +3567,7 @@ endpoint_tests() 
		pm_nl_add_endpoint $ns2 10.0.2.2 flags signal

		pm_nl_check_endpoint "modif is allowed" \

			$ns2 10.0.2.2 id 1 flags signal

		kill_tests_wait

		mptcp_lib_kill_wait $tests_pid

	fi



	if reset "delete and re-add" &&
@@ -3582,7 +3576,8 @@ endpoint_tests() 
		pm_nl_set_limits $ns2 1 1

		pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow

		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

		chk_subflow_nr "before delete" 2
@@ -3597,7 +3592,7 @@ endpoint_tests() 
		wait_mpj $ns2

		chk_subflow_nr "after re-add" 2

		chk_mptcp_info subflows 1 subflows 1

		kill_tests_wait

		mptcp_lib_kill_wait $tests_pid

	fi

}