| From 6c160b636c91e71e50c39134f78257cc35305ff0 Mon Sep 17 00:00:00 2001 |
| From: Geliang Tang <geliang.tang@suse.com> |
| Date: Sun, 4 Jun 2023 20:25:20 -0700 |
| Subject: selftests: mptcp: update userspace pm subflow tests |
| |
| From: Geliang Tang <geliang.tang@suse.com> |
| |
| commit 6c160b636c91e71e50c39134f78257cc35305ff0 upstream. |
| |
| To align with what is done by the in-kernel PM, update userspace pm |
| subflow selftests, by sending the a remove_addrs command together |
| before the remove_subflows command. This will get a RM_ADDR in |
| chk_rm_nr(). |
| |
| Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") |
| Fixes: 5e986ec46874 ("selftests: mptcp: userspace pm subflow tests") |
| Link: https://github.com/multipath-tcp/mptcp_net-next/issues/379 |
| Cc: stable@vger.kernel.org |
| Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net> |
| Signed-off-by: Geliang Tang <geliang.tang@suse.com> |
| Signed-off-by: Mat Martineau <martineau@kernel.org> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh |
| +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh |
| @@ -930,6 +930,7 @@ do_transfer() |
| sleep 1 |
| sp=$(grep "type:10" "$evts_ns2" | |
| sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') |
| + ip netns exec ${connector_ns} ./pm_nl_ctl rem token $tk id $id |
| ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ |
| rip $da rport $dp token $tk |
| fi |
| @@ -3104,7 +3105,7 @@ userspace_tests() |
| pm_nl_set_limits $ns1 0 1 |
| run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow |
| chk_join_nr 1 1 1 |
| - chk_rm_nr 0 1 |
| + chk_rm_nr 1 1 |
| kill_events_pids |
| fi |
| } |
