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

selftests: mptcp: join: rm: set backup flag 



Some of these 'remove' tests rarely fail because a subflow has been
reset instead of cleanly removed. This can happen when one extra subflow
which has never carried data is being closed (FIN) on one side, while
the other is sending data for the first time.

To avoid such subflows to be used right at the end, the backup flag has
been added. With that, data will be only carried on the initial subflow.

Fixes: d2c4333a ("selftests: mptcp: add testcases for removing addrs")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-2-a4332c714e10@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 63c643aa

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

+27 −27
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