mptcp: create subflow or signal
Subsystems (3)
Geliang Tang
cover mptcp: create subflow or signal
Address issue 19 "let PM netlink update live sockets on local addresses list change". The removed addresses part of this issue is done, this patchset only implemented the added addresses part.
Geliang Tang (3):
mptcp: create subflow or signal addr for newly added address
selftests: mptcp: use minus value for removing address numbers
selftests: mptcp: add testcases for newly added addresses
net/mptcp/pm_netlink.c | 37 ++++++ .../testing/selftests/net/mptcp/mptcp_join.sh | 105 +++++++++++++++--- 2 files changed, 125 insertions(+), 17 deletions(-)
Signature · 1 line
2.29.2
Geliang Tang
PATCH 1/3 mptcp: create subflow or signal addr for newly added address
Currently, when a new MPTCP endpoint is added, the existing MPTCP sockets are not affected.
This patch implemented a new function mptcp_nl_add_subflow_or_signal_addr, invoked when an address is added from PM netlink. This function traversed the MPTCP sockets list and invoked mptcp_pm_create_subflow_or_signal_addr to try to create a subflow or signal an address for the newly added address, if local constraint allows that.
--- net/mptcp/pm_netlink.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
net/mptcp/pm_netlink.c +37 -0
@@ -883,6 +883,41 @@ static struct pm_nl_pernet *genl_info_pm_nl(struct genl_info *info)return net_generic (genl_info_net (info), pm_nl_pernet_id); } +static int mptcp_nl_add_subflow_or_signal_addr (struct net *net, +struct mptcp_addr_info *addr) +{ +struct mptcp_sock *msk; +long s_slot =0 , s_num =0 ; + +while ((msk =mptcp_token_iter_next (net, &s_slot, &s_num)) !=NULL ) { +struct pm_nl_pernet *pernet =net_generic (net, pm_nl_pernet_id); +struct sock *sk = (struct sock *)msk; + +spin_lock_bh (&msk->pm.lock); +if (!READ_ONCE (msk->fully_established)) { +spin_unlock_bh (&msk->pm.lock); + goto next; + } + + msk->pm.add_addr_signal_max =READ_ONCE (pernet->add_addr_signal_max); + msk->pm.add_addr_accept_max =READ_ONCE (pernet->add_addr_accept_max); + msk->pm.local_addr_max =READ_ONCE (pernet->local_addr_max); +spin_unlock_bh (&msk->pm.lock); + +lock_sock (sk); +spin_lock_bh (&msk->pm.lock); +mptcp_pm_create_subflow_or_signal_addr (msk); +spin_unlock_bh (&msk->pm.lock); +release_sock (sk); + +next: +sock_put (sk); +cond_resched (); + } + +return 0 ; +} +static int mptcp_nl_cmd_add_addr (struct sk_buff *skb,struct genl_info *info) {struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR ];
@@ -918,6 +953,8 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)return ret; } +mptcp_nl_add_subflow_or_signal_addr (sock_net (skb->sk), &entry->addr); +return 0 ; }
Signature · 1 line
2.29.2
Geliang Tang
PATCH 2/3 selftests: mptcp: use minus value for removing address numbers
This patch changed the remoing addresses numbers to minus value, left the plus one for the adding addresses numbers.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +19 -17
@@ -209,8 +209,8 @@ do_transfer() srv_proto="$4" connect_addr="$5" test_link_fail="$6" - rm_nr_ns1="$7" - rm_nr_ns2="$8" + addr_nr_ns1="$7" + addr_nr_ns2="$8" speed="$9" bkup="${10}"
@@ -264,7 +264,8 @@ do_transfer() fi cpid=$! - if [ $rm_nr_ns1 -gt 0 ]; then + if [ $addr_nr_ns1 -lt 0 ]; then + let rm_nr_ns1=-addr_nr_ns1 if [ $rm_nr_ns1 -lt 8 ]; then counter=1 sleep 1
@@ -281,7 +282,8 @@ do_transfer() fi fi - if [ $rm_nr_ns2 -gt 0 ]; then + if [ $addr_nr_ns2 -lt 0 ]; then + let rm_nr_ns2=-addr_nr_ns2 if [ $rm_nr_ns2 -lt 8 ]; then counter=1 sleep 1
@@ -368,8 +370,8 @@ run_tests() connector_ns="$2" connect_addr="$3" test_linkfail="${4:-0}" - rm_nr_ns1="${5:-0}" - rm_nr_ns2="${6:-0}" + addr_nr_ns1="${5:-0}" + addr_nr_ns2="${6:-0}" speed="${7:-fast}" bkup="${8:-""}" lret=0
@@ -386,7 +388,7 @@ run_tests() fi do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ - ${test_linkfail} ${rm_nr_ns1} ${rm_nr_ns2} ${speed} ${bkup} + ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${bkup} lret=$? if [ "$test_linkfail" -eq 1 ];then
@@ -763,7 +765,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 0 0 1 slow +run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow chk_join_nr "remove single subflow" 1 1 1 chk_rm_nr 1 1
@@ -773,7 +775,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.2.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow +run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow chk_join_nr "remove multiple subflows" 2 2 2 chk_rm_nr 2 2
@@ -782,7 +784,7 @@ reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns2 ./pm_nl_ctl limits 1 1 -run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow +run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow chk_join_nr "remove single address" 1 1 1 chk_add_nr 1 1 chk_rm_nr 0 0
@@ -793,7 +795,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal 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 0 1 1 slow +run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow chk_join_nr "remove subflow and signal" 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1
@@ -805,7 +807,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 0 1 2 slow +run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow chk_join_nr "remove subflows and signal" 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2
@@ -817,7 +819,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 0 8 8 slow +run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush subflows and signal" 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2
@@ -860,7 +862,7 @@ reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal ip netns exec $ns2 ./pm_nl_ctl limits 1 1 -run_tests $ns1 $ns2 dead:beef:1::1 0 1 0 slow +run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow chk_join_nr "remove single address IPv6" 1 1 1 chk_add_nr 1 1 chk_rm_nr 0 0
@@ -871,7 +873,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 2 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal ip netns exec $ns2 ./pm_nl_ctl limits 1 2 ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow -run_tests $ns1 $ns2 dead:beef:1::1 0 1 1 slow +run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow chk_join_nr "remove subflow and signal IPv6" 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1
@@ -953,7 +955,7 @@ reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 ip netns exec $ns2 ./pm_nl_ctl limits 1 1 -run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow +run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow chk_join_nr "remove single address with port" 1 1 1 chk_add_nr 1 1 1 chk_rm_nr 0 0
@@ -964,7 +966,7 @@ ip netns exec $ns1 ./pm_nl_ctl limits 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 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 0 1 1 slow +run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow chk_join_nr "remove subflow and signal with port" 2 2 2 chk_add_nr 1 1 1 chk_rm_nr 1 1
Signature · 1 line
2.29.2
Geliang Tang
PATCH 3/3 selftests: mptcp: add testcases for newly added addresses
This patch added the testcases to create subflows or signal addresses for the newly added IPv4 or IPv6 addresses.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 73 ++++++++++++++++++- 1 file changed, 71 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +71 -2
@@ -264,7 +264,23 @@ do_transfer() fi cpid=$! - if [ $addr_nr_ns1 -lt 0 ]; then + if [ $addr_nr_ns1 -gt 0 ]; then + let add_nr_ns1=addr_nr_ns1 + counter=2 + sleep 1 + while [ $add_nr_ns1 -gt 0 ]; do + local addr + if is_v6 "${connect_addr}"; then + addr="dead:beef:$counter::1" + else + addr="10.0.$counter.1" + fi + ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal + let counter+=1 + let add_nr_ns1-=1 + done + sleep 1 + elif [ $addr_nr_ns1 -lt 0 ]; then let rm_nr_ns1=-addr_nr_ns1 if [ $rm_nr_ns1 -lt 8 ]; then counter=1
@@ -282,7 +298,23 @@ do_transfer() fi fi - if [ $addr_nr_ns2 -lt 0 ]; then + if [ $addr_nr_ns2 -gt 0 ]; then + let add_nr_ns2=addr_nr_ns2 + counter=3 + sleep 1 + while [ $add_nr_ns2 -gt 0 ]; do + local addr + if is_v6 "${connect_addr}"; then + addr="dead:beef:$counter::2" + else + addr="10.0.$counter.2" + fi + ip netns exec $ns2 ./pm_nl_ctl add $addr flags subflow + let counter+=1 + let add_nr_ns2-=1 + done + sleep 1 + elif [ $addr_nr_ns2 -lt 0 ]; then let rm_nr_ns2=-addr_nr_ns2 if [ $rm_nr_ns2 -lt 8 ]; then counter=1
@@ -824,6 +856,43 @@ chk_join_nr "flush subflows and signal" 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 +# add single subflow +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 0 1 +run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow +chk_join_nr "add single subflow" 1 1 1 + +# add signal address +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 1 +ip netns exec $ns2 ./pm_nl_ctl limits 1 1 +run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow +chk_join_nr "add signal address" 1 1 1 +chk_add_nr 1 1 + +# add multiple subflows +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 2 +ip netns exec $ns2 ./pm_nl_ctl limits 0 2 +run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow +chk_join_nr "add multiple subflows" 2 2 2 + +# add multiple subflows IPv6 +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 2 +ip netns exec $ns2 ./pm_nl_ctl limits 0 2 +run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow +chk_join_nr "add multiple subflows IPv6" 2 2 2 + +# add multiple addresses IPv6 +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 2 +ip netns exec $ns2 ./pm_nl_ctl limits 2 2 +run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow +chk_join_nr "add multiple addresses IPv6" 2 2 2 +chk_add_nr 2 2 + # subflow IPv6 reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1
Signature · 1 line
2.29.2
Mat Martineau
[MPTCP] Re: [MPTCP][PATCH mptcp-next 1/3] mptcp: create subflow or signal addr for newly added address
In reply to Geliang TangQuoted 19 lines · Geliang Tang
Currently, when a new MPTCP endpoint is added, the existing MPTCP sockets are not affected.
This patch implemented a new function
mptcp_nl_add_subflow_or_signal_addr, invoked when an address is added from PM netlink. This function traversed the MPTCP sockets list and invokedmptcp_pm_create_subflow_or_signal_addrto try to create a subflow or signal an address for the newly added address, if local constraint allows that.Signed-off-by Geliang Tang <geliangtang(a)gmail.com>---
net/mptcp/pm_netlink.c| 37 +++++++++++++++++++++++++++++++++++++1 file changed, 37 insertions(+)net/mptcp/pm_netlink.c +0
-0
net/mptcp/pm_netlink.c static struct pm_nl_pernet *genl_info_pm_nl(struct genl_info *info) · line 887
Quoted 5 lines
net/mptcp/pm_netlink.c +2
-0@@ -883,6 +883,41 @@ static struct pm_nl_pernet *genl_info_pm_nl(struct genl_info *info)return net_generic (genl_info_net (info), pm_nl_pernet_id); } +static int mptcp_nl_add_subflow_or_signal_addr (struct net *net, +struct mptcp_addr_info *addr)
Looks like 'addr' carried over from copying mptcp_nl_remove_subflow_or_signal_addr() - it's not used in this function. See comment in mptcp_nl_cmd_add_addr() below.
Quoted 7 lines
net/mptcp/pm_netlink.c +7
-0+{ +struct mptcp_sock *msk; +long s_slot =0 , s_num =0 ; + +while ((msk =mptcp_token_iter_next (net, &s_slot, &s_num)) !=NULL ) { +struct pm_nl_pernet *pernet =net_generic (net, pm_nl_pernet_id); +struct sock *sk = (struct sock *)msk;
net/mptcp/pm_netlink.c static struct pm_nl_pernet *genl_info_pm_nl(struct genl_info *info) · line 904
Quoted 10 lines
net/mptcp/pm_netlink.c +10
-0+ +spin_lock_bh (&msk->pm.lock); +if (!READ_ONCE (msk->fully_established)) { +spin_unlock_bh (&msk->pm.lock); + goto next; + } + + msk->pm.add_addr_signal_max =READ_ONCE (pernet->add_addr_signal_max); + msk->pm.add_addr_accept_max =READ_ONCE (pernet->add_addr_accept_max); + msk->pm.local_addr_max =READ_ONCE (pernet->local_addr_max);
Does it still make sense to have per-msk copies of these values, rather than referring directly to the pernet values?
Quoted 20 lines
net/mptcp/pm_netlink.c +16
-0+spin_unlock_bh (&msk->pm.lock); + +lock_sock (sk); +spin_lock_bh (&msk->pm.lock); +mptcp_pm_create_subflow_or_signal_addr (msk); +spin_unlock_bh (&msk->pm.lock); +release_sock (sk); + +next: +sock_put (sk); +cond_resched (); + } + +return 0 ; +} +static int mptcp_nl_cmd_add_addr (struct sk_buff *skb,struct genl_info *info) {struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR ];
net/mptcp/pm_netlink.c static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info) · line 956
Quoted 4 lines
net/mptcp/pm_netlink.c +1
-0@@ -918,6 +953,8 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb, struct genl_info *info)return ret; } +mptcp_nl_add_subflow_or_signal_addr (sock_net (skb->sk), &entry->addr);
The entry->addr is ignored in mptcp_nl_add_subflow_or_signal_addr() right now.
It looks like the select_signal_address() and select_local_address() are intended to select the newest entries anyway, so you could either remove the addr parameter or use it to make sure the expected address is announced or connected.
Quoted 6 lines
net/mptcp/pm_netlink.c +1
-0+return 0 ; }Signature · 1 line
2.29.2
--
Mat Martineau
Intel