Skip to content

Commit

Permalink
selftests: mptcp: remove id 0 subflow & address
Browse files Browse the repository at this point in the history
This patch adds selftests for userpsace PM to remove id 0 subflow and
id 0 address.

A new helper userspace_pm_rm_id_0_subflow_or_address_ns2() is added,
in it use

        ./pm_nl_ctl dsf token $tk id 0

to remove id 0 subflow, and use

        ./pm_nl_ctl rem token $tk id 0

to remove id 0 address.

Signed-off-by: Geliang Tang <[email protected]>
  • Loading branch information
geliangtang authored and intel-lab-lkp committed Aug 9, 2023
1 parent f59fa7c commit c2e99d1
Showing 1 changed file with 49 additions and 0 deletions.
49 changes: 49 additions & 0 deletions tools/testing/selftests/net/mptcp/mptcp_join.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3320,6 +3320,15 @@ userspace_pm_rm_sf_addr_ns2()
wait_rm_sf $ns2 1
}

userspace_pm_rm_id_0_subflow_or_address_ns2()
{
local tk

tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2")
ip netns exec $ns2 ./pm_nl_ctl "$1" token $tk id 0
sleep 0.5
}

userspace_tests()
{
# userspace pm type prevents add_addr
Expand Down Expand Up @@ -3434,6 +3443,46 @@ userspace_tests()
kill_events_pids
wait $tests_pid
fi

# userspace pm remove id 0 subflow
if reset_with_events "userspace pm remove id 0 subflow" &&
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
set_userspace_pm $ns2
pm_nl_set_limits $ns1 0 2
speed=10 \
run_tests $ns1 $ns2 10.0.1.1 &
local tests_pid=$!
wait_mpj $ns2
userspace_pm_add_sf 10.0.1.2 0
userspace_pm_add_sf 10.0.3.2 20
chk_join_nr 2 2 2
chk_mptcp_info subflows 2 subflows 2
userspace_pm_rm_id_0_subflow_or_address_ns2 dsf
chk_mptcp_info subflows 1 subflows 1
chk_rm_nr 0 2
kill_events_pids
wait $tests_pid
fi

# userspace pm remove id 0 address
if reset_with_events "userspace pm remove id 0 address" &&
continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then
set_userspace_pm $ns2
pm_nl_set_limits $ns1 0 2
speed=10 \
run_tests $ns1 $ns2 10.0.1.1 &
local tests_pid=$!
wait_mpj $ns2
userspace_pm_add_sf 10.0.1.2 0
userspace_pm_add_sf 10.0.3.2 20
chk_join_nr 2 2 2
chk_mptcp_info subflows 2 subflows 2
userspace_pm_rm_id_0_subflow_or_address_ns2 rem
chk_mptcp_info subflows 1 subflows 1
chk_rm_nr 2 0
kill_events_pids
wait $tests_pid
fi
}

endpoint_tests()
Expand Down

0 comments on commit c2e99d1

Please sign in to comment.