Commit 7a6fa4f8 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'selftests-mptcp-join-fix-some-flaky-tests' 

Matthieu Baerts says:

====================
selftests: mptcp: join: fix some flaky tests

When looking at the recent CI results on NIPA and MPTCP CIs, a few MPTCP
Join tests are marked as unstable. Here are some fixes for that.

- Patch 1: a small fix for mptcp_connect.sh, printing a note as
  initially intended. For >=v5.13.

- Patch 2: avoid unexpected reset when closing subflows. For >= 5.13.

- Patches 3-4: longer transfer when not waiting for the end. For >=5.18.

- Patch 5: read all received data when expecting a reset. For >= v6.1.

- Patch 6: a fix to properly kill background tasks. For >= v6.5.
====================

Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-0-a4332c714e10@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 27bcc05b 852b644a

tools/testing/selftests/net/mptcp/mptcp_connect.c

+13 −5
Original line number Diff line number Diff line
@@ -710,8 +710,14 @@ static int copyfd_io_poll(int infd, int peerfd, int outfd, 


				bw = do_rnd_write(peerfd, winfo->buf + winfo->off, winfo->len);

				if (bw < 0) {

					if (cfg_rcv_trunc)

						return 0;

					/* expected reset, continue to read */

					if (cfg_rcv_trunc &&

					    (errno == ECONNRESET ||

					     errno == EPIPE)) {

						fds.events &= ~POLLOUT;

						continue;

					}



					perror("write");

					return 111;

				}
@@ -737,8 +743,10 @@ static int copyfd_io_poll(int infd, int peerfd, int outfd, 
		}



		if (fds.revents & (POLLERR | POLLNVAL)) {

			if (cfg_rcv_trunc)

				return 0;

			if (cfg_rcv_trunc) {

				fds.events &= ~(POLLERR | POLLNVAL);

				continue;

			}

			fprintf(stderr, "Unexpected revents: "

				"POLLERR/POLLNVAL(%x)\n", fds.revents);

			return 5;
@@ -1433,7 +1441,7 @@ static void parse_opts(int argc, char **argv) 
			 */

			if (cfg_truncate < 0) {

				cfg_rcv_trunc = true;

				signal(SIGPIPE, handle_signal);

				signal(SIGPIPE, SIG_IGN);

			}

			break;

		case 'j':

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

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ do_transfer() 
				  "than expected (${expect_synrx})"

		retc=1

	fi

	if [ ${stat_ackrx_now_l} -lt ${expect_ackrx} ] && [ ${stat_ooo_now} -eq 0 ]; then

	if [ ${stat_ackrx_now_l} -lt ${expect_ackrx} ]; then

		if [ ${stat_ooo_now} -eq 0 ]; then

			mptcp_lib_pr_fail "lower MPC ACK rx (${stat_ackrx_now_l})" \

					  "than expected (${expect_ackrx})"

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

+45 −45
Original line number Diff line number Diff line
@@ -2532,7 +2532,7 @@ remove_tests() 
	if reset "remove single subflow"; then

		pm_nl_set_limits $ns1 0 1

		pm_nl_set_limits $ns2 0 1

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup

		addr_nr_ns2=-1 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 1 1 1
@@ -2545,8 +2545,8 @@ remove_tests() 
	if reset "remove multiple subflows"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_set_limits $ns2 0 2

		pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup

		addr_nr_ns2=-2 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 2 2 2
@@ -2557,7 +2557,7 @@ remove_tests() 
	# single address, remove

	if reset "remove single address"; then

		pm_nl_set_limits $ns1 0 1

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup

		pm_nl_set_limits $ns2 1 1

		addr_nr_ns1=-1 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1
@@ -2570,9 +2570,9 @@ remove_tests() 
	# subflow and signal, remove

	if reset "remove subflow and signal"; then

		pm_nl_set_limits $ns1 0 2

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup

		pm_nl_set_limits $ns2 1 2

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup

		addr_nr_ns1=-1 addr_nr_ns2=-1 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 2 2 2
@@ -2584,10 +2584,10 @@ remove_tests() 
	# subflows and signal, remove

	if reset "remove subflows and signal"; then

		pm_nl_set_limits $ns1 0 3

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup

		pm_nl_set_limits $ns2 1 3

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup

		pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup

		addr_nr_ns1=-1 addr_nr_ns2=-2 speed=10 \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 3 3 3
@@ -2599,9 +2599,9 @@ remove_tests() 
	# addresses remove

	if reset "remove addresses"; then

		pm_nl_set_limits $ns1 3 3

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.4.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup id 250

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup

		pm_nl_add_endpoint $ns1 10.0.4.1 flags signal,backup

		pm_nl_set_limits $ns2 3 3

		addr_nr_ns1=-3 speed=10 \

			run_tests $ns1 $ns2 10.0.1.1
@@ -2614,10 +2614,10 @@ remove_tests() 
	# invalid addresses remove

	if reset "remove invalid addresses"; then

		pm_nl_set_limits $ns1 3 3

		pm_nl_add_endpoint $ns1 10.0.12.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.12.1 flags signal,backup

		# broadcast IP: no packet for this address will be received on ns1

		pm_nl_add_endpoint $ns1 224.0.0.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal

		pm_nl_add_endpoint $ns1 224.0.0.1 flags signal,backup

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup

		pm_nl_set_limits $ns2 2 2

		addr_nr_ns1=-3 speed=10 \

			run_tests $ns1 $ns2 10.0.1.1
@@ -2631,10 +2631,10 @@ remove_tests() 
	# subflows and signal, flush

	if reset "flush subflows and signal"; then

		pm_nl_set_limits $ns1 0 3

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup

		pm_nl_set_limits $ns2 1 3

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup

		pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup

		addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 3 3 3
@@ -2647,9 +2647,9 @@ remove_tests() 
	if reset "flush subflows"; then

		pm_nl_set_limits $ns1 3 3

		pm_nl_set_limits $ns2 3 3

		pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow

		pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup id 150

		pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup

		pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup

		addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1

		chk_join_nr 3 3 3
@@ -2666,9 +2666,9 @@ remove_tests() 
	# addresses flush

	if reset "flush addresses"; then

		pm_nl_set_limits $ns1 3 3

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.4.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup id 250

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup

		pm_nl_add_endpoint $ns1 10.0.4.1 flags signal,backup

		pm_nl_set_limits $ns2 3 3

		addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1
@@ -2681,9 +2681,9 @@ remove_tests() 
	# invalid addresses flush

	if reset "flush invalid addresses"; then

		pm_nl_set_limits $ns1 3 3

		pm_nl_add_endpoint $ns1 10.0.12.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.14.1 flags signal

		pm_nl_add_endpoint $ns1 10.0.12.1 flags signal,backup

		pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup

		pm_nl_add_endpoint $ns1 10.0.14.1 flags signal,backup

		pm_nl_set_limits $ns2 3 3

		addr_nr_ns1=-8 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1
@@ -3806,7 +3806,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns1

		pm_nl_set_limits $ns2 2 2

		{ speed=5 \

		{ test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns1
@@ -3831,7 +3831,7 @@ userspace_tests() 
		chk_mptcp_info subflows 0 subflows 0

		chk_subflows_total 1 1

		kill_events_pids

		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid

	fi



	# userspace pm create destroy subflow
@@ -3839,7 +3839,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns2

		pm_nl_set_limits $ns1 0 1

		{ speed=5 \

		{ test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns2
@@ -3859,7 +3859,7 @@ userspace_tests() 
		chk_mptcp_info subflows 0 subflows 0

		chk_subflows_total 1 1

		kill_events_pids

		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid

	fi



	# userspace pm create id 0 subflow
@@ -3867,7 +3867,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns2

		pm_nl_set_limits $ns1 0 1

		{ speed=5 \

		{ test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns2
@@ -3880,7 +3880,7 @@ userspace_tests() 
		chk_mptcp_info subflows 1 subflows 1

		chk_subflows_total 2 2

		kill_events_pids

		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid

	fi



	# userspace pm remove initial subflow
@@ -3888,7 +3888,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns2

		pm_nl_set_limits $ns1 0 1

		{ speed=5 \

		{ test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns2
@@ -3904,7 +3904,7 @@ userspace_tests() 
		chk_mptcp_info subflows 1 subflows 1

		chk_subflows_total 1 1

		kill_events_pids

		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid

	fi



	# userspace pm send RM_ADDR for ID 0
@@ -3912,7 +3912,7 @@ userspace_tests() 
	   continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then

		set_userspace_pm $ns1

		pm_nl_set_limits $ns2 1 1

		{ speed=5 \

		{ test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!

		wait_mpj $ns1
@@ -3930,7 +3930,7 @@ userspace_tests() 
		chk_mptcp_info subflows 1 subflows 1

		chk_subflows_total 1 1

		kill_events_pids

		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid

	fi

}
@@ -3943,7 +3943,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

		{ speed=slow \

		{ test_linkfail=128 speed=slow \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!
@@ -3960,7 +3960,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

		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid

	fi



	if reset_with_tcp_filter "delete and re-add" ns2 10.0.3.2 REJECT OUTPUT &&
@@ -3970,7 +3970,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

		{ test_linkfail=4 speed=5 \

		{ test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!
@@ -4015,7 +4015,7 @@ endpoint_tests() 
			chk_mptcp_info subflows 3 subflows 3

		done



		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid



		kill_events_pids

		chk_evt_nr ns1 MPTCP_LIB_EVENT_LISTENER_CREATED 1
@@ -4048,7 +4048,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

		{ test_linkfail=4 speed=5 \

		{ test_linkfail=128 speed=5 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!
@@ -4089,7 +4089,7 @@ endpoint_tests() 
		wait_mpj $ns2

		chk_subflow_nr "after re-re-add ID 0" 3

		chk_mptcp_info subflows 3 subflows 3

		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid



		kill_events_pids

		chk_evt_nr ns1 MPTCP_LIB_EVENT_LISTENER_CREATED 1
@@ -4121,7 +4121,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

		{ test_linkfail=4 speed=20 \

		{ test_linkfail=128 speed=20 \

			run_tests $ns1 $ns2 10.0.1.1 & } 2>/dev/null

		local tests_pid=$!
@@ -4137,7 +4137,7 @@ endpoint_tests() 
		wait_mpj $ns2

		pm_nl_add_endpoint $ns1 10.0.3.1 id 2 flags signal

		wait_mpj $ns2

		mptcp_lib_kill_wait $tests_pid

		mptcp_lib_kill_group_wait $tests_pid



		join_syn_tx=3 join_connect_err=1 \

			chk_join_nr 2 2 2

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

+21 −0
Original line number Diff line number Diff line
@@ -350,6 +350,27 @@ mptcp_lib_kill_wait() { 
	wait "${1}" 2>/dev/null

}



# $1: PID

mptcp_lib_pid_list_children() {

	local curr="${1}"

	# evoke 'ps' only once

	local pids="${2:-"$(ps o pid,ppid)"}"



	echo "${curr}"



	local pid

	for pid in $(echo "${pids}" | awk "\$2 == ${curr} { print \$1 }"); do

		mptcp_lib_pid_list_children "${pid}" "${pids}"

	done

}



# $1: PID

mptcp_lib_kill_group_wait() {

	# Some users might not have procps-ng: cannot use "kill -- -PID"

	mptcp_lib_pid_list_children "${1}" | xargs -r kill &>/dev/null

	wait "${1}" 2>/dev/null

}



# $1: IP address

mptcp_lib_is_v6() {

	[ -z "${1##*:*}" ]