selftests: mptcp: add link failure test case
Subsystems (3)
Florian Westphal
PATCH 1/1 selftests: mptcp: add link failure test case
Add a test case where a link fails with multiple subflows. The expectation is that MPTCP will transmit any data that could not be delivered via the failed link on another subflow.
---
NB: One could make the 'down link' deterministic:
this will down one of the 4 links randonly.
The test case is new, its a copy of
"multiple subflows and signal", just with added link-fail.
Alternative would be to just extend the existing one.
.../testing/selftests/net/mptcp/mptcp_join.sh | 111 +++++++++++++----- 1 file changed, 84 insertions(+), 27 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +84 -27
@@ -5,6 +5,7 @@ ret=0 sin="" sout="" cin="" +cinsent="" cout="" ksft_skip=4 timeout=30
@@ -63,7 +64,7 @@ cleanup_partial() cleanup() { rm -f "$cin" "$cout" - rm -f "$sin" "$sout" + rm -f "$cin" "$cout" "$cinsent" cleanup_partial }
@@ -94,6 +95,12 @@ if [ $? -ne 0 ];then exit $ksft_skip fi +print_file_err() +{ + ls -l "$1" 1>&2 + echo "Trailing bytes are: " + tail -c 27 "$1" +} check_transfer() {
@@ -126,6 +133,17 @@ do_ping() fi } +link_failure() +{ + ns="$1" + + l=$((RANDOM%4)) + l=$((l+1)) + + veth="ns1eth$l" + ip -net "$ns" link set "$veth" down +} + do_transfer() { listener_ns="$1"
@@ -135,6 +153,7 @@ do_transfer() connect_addr="$5" rm_nr_ns1="$6" rm_nr_ns2="$7" + test_link_fail="$8" port=$((10000+$TEST_COUNT)) TEST_COUNT=$((TEST_COUNT+1))
@@ -170,7 +189,12 @@ do_transfer() sleep 1 - ip netns exec ${connector_ns} $mptcp_connect -t $timeout -p $port -s ${cl_proto} $connect_addr < "$cin" > "$cout" & + if [ "$test_link_fail" -eq 0 ];then + ip netns exec ${connector_ns} $mptcp_connect -t $timeout -p $port -s ${cl_proto} $connect_addr < "$cin" > "$cout" & + else + ( cat "$cin" ; sleep 2; link_failure $listener_ns ; cat "$cin" ) | tee "$cinsent" | \ + ip netns exec ${connector_ns} $mptcp_connect -t $timeout -p $port -s ${cl_proto} $connect_addr > "$cout" & + fi cpid=$! if [ $rm_nr_ns1 -gt 0 ]; then
@@ -220,7 +244,11 @@ do_transfer() check_transfer $sin $cout "file received by client" retc=$? - check_transfer $cin $sout "file received by server" + if [ "$test_link_fail" -eq 0 ];then + check_transfer $cin $sout "file received by server" + else + check_transfer $cinsent $sout "file received by server" + fi rets=$? if [ $retc -eq 0 ] && [ $rets -eq 0 ];then
@@ -236,13 +264,12 @@ make_file() { name=$1 who=$2 + size=$3 - SIZE=1 - - dd if=/dev/urandom of="$name" bs=1024 count=$SIZE 2> /dev/null + dd if=/dev/urandom of="$name" bs=1024 count=$size 2> /dev/null echo -e "\nMPTCP_TEST_FILE_END_MARKER" >> "$name" - echo "Created $name (size $SIZE KB) containing data sent by $who" + echo "Created $name (size $size KB) containing data sent by $who" } run_tests()
@@ -250,10 +277,28 @@ run_tests() listener_ns="$1" connector_ns="$2" connect_addr="$3" + test_linkfail="$4" lret=0 + oldin="" + + if [ "$test_linkfail" -eq 1 ];then + size=$((RANDOM%1024)) + size=$((size+1)) + size=$((size*128)) - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} 0 0 + oldin=$(mktemp) + cp "$cin" "$oldin" + make_file "$cin" "client" $size + fi + + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} 0 0 "$test_linkfail" lret=$? + + if [ "$test_linkfail" -eq 1 ];then + cp "$oldin" "$cin" + rm -f "$oldin" + fi + if [ $lret -ne 0 ]; then ret=$lret return
@@ -269,7 +314,7 @@ run_remove_tests() rm_nr_ns2="$5" lret=0 - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${rm_nr_ns1} ${rm_nr_ns2} + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${rm_nr_ns1} ${rm_nr_ns2} 0 lret=$? if [ $lret -ne 0 ]; then ret=$lret
@@ -403,26 +448,27 @@ chk_rm_nr() sin=$(mktemp) sout=$(mktemp) cin=$(mktemp) +cinsent=$(mktemp) cout=$(mktemp) init -make_file "$cin" "client" -make_file "$sin" "server" +make_file "$cin" "client" 1 +make_file "$sin" "server" 1 trap cleanup EXIT -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "no JOIN" "0" "0" "0" # subflow limted by client reset ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "single subflow, limited by client" 0 0 0 # subflow limted by server reset ip netns exec $ns2 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "single subflow, limited by server" 1 1 0 # subflow
@@ -430,7 +476,7 @@ reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "single subflow" 1 1 1 # multiple subflows
@@ -439,7 +485,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 2 ip netns exec $ns2 ./pm_nl_ctl limits 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "multiple subflows" 2 2 2 # multiple subflows limited by serverf
@@ -448,13 +494,13 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl limits 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "multiple subflows, limited by server" 2 2 1 # add_address, unused reset ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "unused signal address" 0 0 0 chk_add_nr 1 1
@@ -463,7 +509,7 @@ reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl limits 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "signal address" 1 1 1 chk_add_nr 1 1
@@ -476,7 +522,7 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns1 ./pm_nl_ctl limits 0 2 ip netns exec $ns2 ./pm_nl_ctl limits 1 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "subflow and signal" 2 2 2 chk_add_nr 1 1
@@ -487,10 +533,21 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns2 ./pm_nl_ctl limits 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "multiple subflows and signal" 3 3 3 chk_add_nr 1 1 +# accept and use add_addr with additional subflows +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 3 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +ip netns exec $ns2 ./pm_nl_ctl limits 1 3 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow +run_tests $ns1 $ns2 10.0.1.1 1 +chk_join_nr "multiple flows, signal, link failure" 3 3 3 +chk_add_nr 1 1 + # single subflow, remove reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1
@@ -548,7 +605,7 @@ reset_with_cookies ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "single subflow with syn cookies" 1 1 1 # multiple subflows with syn cookies
@@ -557,7 +614,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 2 ip netns exec $ns2 ./pm_nl_ctl limits 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "multiple subflows with syn cookies" 2 2 2 # multiple subflows limited by server
@@ -566,7 +623,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl limits 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "subflows limited by server w cookies" 2 2 1 # test signal address with cookies
@@ -574,7 +631,7 @@ reset_with_cookies ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns2 ./pm_nl_ctl limits 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "signal address with syn cookies" 1 1 1 chk_add_nr 1 1
@@ -584,7 +641,7 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns1 ./pm_nl_ctl limits 0 2 ip netns exec $ns2 ./pm_nl_ctl limits 1 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "subflow and signal w cookies" 2 2 2 chk_add_nr 1 1
@@ -595,7 +652,7 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns2 ./pm_nl_ctl limits 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "subflows and signal w. cookies" 3 3 3 chk_add_nr 1 1
Signature · 1 line
2.26.2
Mat Martineau
Quoted 8 lines · Florian Westphal
Add a test case where a link fails with multiple subflows. The expectation is that MPTCP will transmit any data that could not be delivered via the failed link on another subflow.
Signed-off-by Florian Westphal <fw(a)strlen.de>---
NB: One could make the 'down link' deterministic:
this will down one of the 4 links randonly.
The random link selection is good, since it looks like some retransmission behavior is currently affected by the order of the subflows.
Quoted 5 lines
The test case is new, its a copy of
"multiple subflows and signal", just with added link-fail.Alternative would be to just extend the existing one.
New test case is fine by me.
Quoted 8 lines
.../testing/selftests/net/mptcp/mptcp_join.sh| 111 +++++++++++++-----1 file changed, 84 insertions(+), 27 deletions(-)tools/testing/selftests/net/mptcp/mptcp_join.sh +0
-0
...
Quoted 10 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +0
-0@@ -487,10 +533,21 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signalip netns exec $ns2 ./pm_nl_ctl limits 1 3
ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflowtools/testing/selftests/net/mptcp/mptcp_join.sh +1
-1-run_tests $ns1 $ns2 10.0.1.1 +run_tests $ns1 $ns2 10.0.1.1 0
chk_join_nr"multiple subflows and signal" 3 3 3chk_add_nr1 1+# accept and use
add_addrwith additional subflows
"...and link loss" (to differentiate from previous test)
Quoted 10 lines
tools/testing/selftests/net/mptcp/mptcp_join.sh +10
-0+reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 3 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +ip netns exec $ns2 ./pm_nl_ctl limits 1 3 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow +run_tests $ns1 $ns2 10.0.1.1 1 +chk_join_nr "multiple flows, signal, link failure" 3 3 3 +chk_add_nr 1 1 +
Quoted 3 lines
# single subflow, remove reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1
--
Mat Martineau
Intel