Skip to content

Commit aea73ba

Browse files
matttbekuba-moo
matttbe
authored and
kuba-moo
committed
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: d2c4333 ("selftests: mptcp: add testcases for removing addrs") Cc: stable@vger.kernel.org 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-2-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 63c643a commit aea73ba

1 file changed

Lines changed: 27 additions & 27 deletions

File tree

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2532,7 +2532,7 @@ remove_tests()
25322532
if reset "remove single subflow"; then
25332533
pm_nl_set_limits $ns1 0 1
25342534
pm_nl_set_limits $ns2 0 1
2535-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2535+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
25362536
addr_nr_ns2=-1 speed=slow \
25372537
run_tests $ns1 $ns2 10.0.1.1
25382538
chk_join_nr 1 1 1
@@ -2545,8 +2545,8 @@ remove_tests()
25452545
if reset "remove multiple subflows"; then
25462546
pm_nl_set_limits $ns1 0 2
25472547
pm_nl_set_limits $ns2 0 2
2548-
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
2549-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2548+
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup
2549+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
25502550
addr_nr_ns2=-2 speed=slow \
25512551
run_tests $ns1 $ns2 10.0.1.1
25522552
chk_join_nr 2 2 2
@@ -2557,7 +2557,7 @@ remove_tests()
25572557
# single address, remove
25582558
if reset "remove single address"; then
25592559
pm_nl_set_limits $ns1 0 1
2560-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
2560+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup
25612561
pm_nl_set_limits $ns2 1 1
25622562
addr_nr_ns1=-1 speed=slow \
25632563
run_tests $ns1 $ns2 10.0.1.1
@@ -2570,9 +2570,9 @@ remove_tests()
25702570
# subflow and signal, remove
25712571
if reset "remove subflow and signal"; then
25722572
pm_nl_set_limits $ns1 0 2
2573-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
2573+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup
25742574
pm_nl_set_limits $ns2 1 2
2575-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2575+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
25762576
addr_nr_ns1=-1 addr_nr_ns2=-1 speed=slow \
25772577
run_tests $ns1 $ns2 10.0.1.1
25782578
chk_join_nr 2 2 2
@@ -2584,10 +2584,10 @@ remove_tests()
25842584
# subflows and signal, remove
25852585
if reset "remove subflows and signal"; then
25862586
pm_nl_set_limits $ns1 0 3
2587-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
2587+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup
25882588
pm_nl_set_limits $ns2 1 3
2589-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2590-
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
2589+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
2590+
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup
25912591
addr_nr_ns1=-1 addr_nr_ns2=-2 speed=10 \
25922592
run_tests $ns1 $ns2 10.0.1.1
25932593
chk_join_nr 3 3 3
@@ -2599,9 +2599,9 @@ remove_tests()
25992599
# addresses remove
26002600
if reset "remove addresses"; then
26012601
pm_nl_set_limits $ns1 3 3
2602-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
2603-
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
2604-
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
2602+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup id 250
2603+
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup
2604+
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal,backup
26052605
pm_nl_set_limits $ns2 3 3
26062606
addr_nr_ns1=-3 speed=10 \
26072607
run_tests $ns1 $ns2 10.0.1.1
@@ -2614,10 +2614,10 @@ remove_tests()
26142614
# invalid addresses remove
26152615
if reset "remove invalid addresses"; then
26162616
pm_nl_set_limits $ns1 3 3
2617-
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
2617+
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal,backup
26182618
# broadcast IP: no packet for this address will be received on ns1
2619-
pm_nl_add_endpoint $ns1 224.0.0.1 flags signal
2620-
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
2619+
pm_nl_add_endpoint $ns1 224.0.0.1 flags signal,backup
2620+
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup
26212621
pm_nl_set_limits $ns2 2 2
26222622
addr_nr_ns1=-3 speed=10 \
26232623
run_tests $ns1 $ns2 10.0.1.1
@@ -2631,10 +2631,10 @@ remove_tests()
26312631
# subflows and signal, flush
26322632
if reset "flush subflows and signal"; then
26332633
pm_nl_set_limits $ns1 0 3
2634-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
2634+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup
26352635
pm_nl_set_limits $ns2 1 3
2636-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2637-
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
2636+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
2637+
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup
26382638
addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
26392639
run_tests $ns1 $ns2 10.0.1.1
26402640
chk_join_nr 3 3 3
@@ -2647,9 +2647,9 @@ remove_tests()
26472647
if reset "flush subflows"; then
26482648
pm_nl_set_limits $ns1 3 3
26492649
pm_nl_set_limits $ns2 3 3
2650-
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150
2651-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2652-
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
2650+
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup id 150
2651+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
2652+
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup
26532653
addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
26542654
run_tests $ns1 $ns2 10.0.1.1
26552655
chk_join_nr 3 3 3
@@ -2666,9 +2666,9 @@ remove_tests()
26662666
# addresses flush
26672667
if reset "flush addresses"; then
26682668
pm_nl_set_limits $ns1 3 3
2669-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
2670-
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
2671-
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
2669+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup id 250
2670+
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup
2671+
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal,backup
26722672
pm_nl_set_limits $ns2 3 3
26732673
addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
26742674
run_tests $ns1 $ns2 10.0.1.1
@@ -2681,9 +2681,9 @@ remove_tests()
26812681
# invalid addresses flush
26822682
if reset "flush invalid addresses"; then
26832683
pm_nl_set_limits $ns1 3 3
2684-
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
2685-
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
2686-
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
2684+
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal,backup
2685+
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup
2686+
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal,backup
26872687
pm_nl_set_limits $ns2 3 3
26882688
addr_nr_ns1=-8 speed=slow \
26892689
run_tests $ns1 $ns2 10.0.1.1

0 commit comments

Comments
 (0)