Skip to content

Commit 927bb57

Browse files
matttbegregkh
matttbe
authored and
gregkh
committed
selftests: mptcp: join: rm: set backup flag
commit aea73bae662a0e184393d6d7d0feb18d2577b9b9 upstream. 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: [email protected] Reviewed-by: Geliang Tang <[email protected]> Signed-off-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/20251110-net-mptcp-sft-join-unstable-v1-2-a4332c714e10@kernel.org Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ef51fbb commit 927bb57

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
@@ -2347,7 +2347,7 @@ remove_tests()
23472347
if reset "remove single subflow"; then
23482348
pm_nl_set_limits $ns1 0 1
23492349
pm_nl_set_limits $ns2 0 1
2350-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2350+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
23512351
addr_nr_ns2=-1 speed=slow \
23522352
run_tests $ns1 $ns2 10.0.1.1
23532353
chk_join_nr 1 1 1
@@ -2360,8 +2360,8 @@ remove_tests()
23602360
if reset "remove multiple subflows"; then
23612361
pm_nl_set_limits $ns1 0 2
23622362
pm_nl_set_limits $ns2 0 2
2363-
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow
2364-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2363+
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup
2364+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
23652365
addr_nr_ns2=-2 speed=slow \
23662366
run_tests $ns1 $ns2 10.0.1.1
23672367
chk_join_nr 2 2 2
@@ -2372,7 +2372,7 @@ remove_tests()
23722372
# single address, remove
23732373
if reset "remove single address"; then
23742374
pm_nl_set_limits $ns1 0 1
2375-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
2375+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup
23762376
pm_nl_set_limits $ns2 1 1
23772377
addr_nr_ns1=-1 speed=slow \
23782378
run_tests $ns1 $ns2 10.0.1.1
@@ -2385,9 +2385,9 @@ remove_tests()
23852385
# subflow and signal, remove
23862386
if reset "remove subflow and signal"; then
23872387
pm_nl_set_limits $ns1 0 2
2388-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
2388+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup
23892389
pm_nl_set_limits $ns2 1 2
2390-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2390+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
23912391
addr_nr_ns1=-1 addr_nr_ns2=-1 speed=slow \
23922392
run_tests $ns1 $ns2 10.0.1.1
23932393
chk_join_nr 2 2 2
@@ -2399,10 +2399,10 @@ remove_tests()
23992399
# subflows and signal, remove
24002400
if reset "remove subflows and signal"; then
24012401
pm_nl_set_limits $ns1 0 3
2402-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
2402+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup
24032403
pm_nl_set_limits $ns2 1 3
2404-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2405-
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
2404+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
2405+
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup
24062406
addr_nr_ns1=-1 addr_nr_ns2=-2 speed=10 \
24072407
run_tests $ns1 $ns2 10.0.1.1
24082408
chk_join_nr 3 3 3
@@ -2414,9 +2414,9 @@ remove_tests()
24142414
# addresses remove
24152415
if reset "remove addresses"; then
24162416
pm_nl_set_limits $ns1 3 3
2417-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
2418-
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
2419-
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
2417+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup id 250
2418+
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup
2419+
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal,backup
24202420
pm_nl_set_limits $ns2 3 3
24212421
addr_nr_ns1=-3 speed=10 \
24222422
run_tests $ns1 $ns2 10.0.1.1
@@ -2429,10 +2429,10 @@ remove_tests()
24292429
# invalid addresses remove
24302430
if reset "remove invalid addresses"; then
24312431
pm_nl_set_limits $ns1 3 3
2432-
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
2432+
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal,backup
24332433
# broadcast IP: no packet for this address will be received on ns1
2434-
pm_nl_add_endpoint $ns1 224.0.0.1 flags signal
2435-
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
2434+
pm_nl_add_endpoint $ns1 224.0.0.1 flags signal,backup
2435+
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup
24362436
pm_nl_set_limits $ns2 2 2
24372437
addr_nr_ns1=-3 speed=10 \
24382438
run_tests $ns1 $ns2 10.0.1.1
@@ -2446,10 +2446,10 @@ remove_tests()
24462446
# subflows and signal, flush
24472447
if reset "flush subflows and signal"; then
24482448
pm_nl_set_limits $ns1 0 3
2449-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal
2449+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup
24502450
pm_nl_set_limits $ns2 1 3
2451-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2452-
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
2451+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
2452+
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup
24532453
addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
24542454
run_tests $ns1 $ns2 10.0.1.1
24552455
chk_join_nr 3 3 3
@@ -2462,9 +2462,9 @@ remove_tests()
24622462
if reset "flush subflows"; then
24632463
pm_nl_set_limits $ns1 3 3
24642464
pm_nl_set_limits $ns2 3 3
2465-
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150
2466-
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow
2467-
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow
2465+
pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup id 150
2466+
pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup
2467+
pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow,backup
24682468
addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
24692469
run_tests $ns1 $ns2 10.0.1.1
24702470
chk_join_nr 3 3 3
@@ -2481,9 +2481,9 @@ remove_tests()
24812481
# addresses flush
24822482
if reset "flush addresses"; then
24832483
pm_nl_set_limits $ns1 3 3
2484-
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250
2485-
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
2486-
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal
2484+
pm_nl_add_endpoint $ns1 10.0.2.1 flags signal,backup id 250
2485+
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup
2486+
pm_nl_add_endpoint $ns1 10.0.4.1 flags signal,backup
24872487
pm_nl_set_limits $ns2 3 3
24882488
addr_nr_ns1=-8 addr_nr_ns2=-8 speed=slow \
24892489
run_tests $ns1 $ns2 10.0.1.1
@@ -2496,9 +2496,9 @@ remove_tests()
24962496
# invalid addresses flush
24972497
if reset "flush invalid addresses"; then
24982498
pm_nl_set_limits $ns1 3 3
2499-
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal
2500-
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal
2501-
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal
2499+
pm_nl_add_endpoint $ns1 10.0.12.1 flags signal,backup
2500+
pm_nl_add_endpoint $ns1 10.0.3.1 flags signal,backup
2501+
pm_nl_add_endpoint $ns1 10.0.14.1 flags signal,backup
25022502
pm_nl_set_limits $ns2 3 3
25032503
addr_nr_ns1=-8 speed=slow \
25042504
run_tests $ns1 $ns2 10.0.1.1

0 commit comments

Comments
 (0)