mptcp: create subflow for newly added address and testcases
Subsystems (3)
Geliang Tang
v4 cover mptcp: create subflow for newly added address and testcases
v4:
- add a new patch to use WRITE_ONCE/READ_ONCE for the pernet *_max.
- drop pm *_max in mptcp_diag.c too.
v3:
- add a new patch to drop *_max fields in mptcp_pm_data
v2:
- drop the unused addr parameter in mptcp_nl_add_subflow_or_signal_addr
- use the pernet *_max values in mptcp_pm_create_subflow_or_signal_addr
instead of the per-msk values.
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 (5):
mptcp: use WRITE_ONCE/READ_ONCE for the pernet *_max
mptcp: drop *_max fields in mptcp_pm_data
mptcp: create subflow or signal addr for newly added address
selftests: mptcp: use minus values for removing address numbers
selftests: mptcp: add testcases for newly added addresses
net/mptcp/mptcp_diag.c | 6 +- net/mptcp/pm.c | 9 +- net/mptcp/pm_netlink.c | 150 +++++++++++++----- net/mptcp/protocol.h | 8 +- .../testing/selftests/net/mptcp/mptcp_join.sh | 101 ++++++++++-- 5 files changed, 211 insertions(+), 63 deletions(-)
Signature · 1 line
2.29.2
Geliang Tang
PATCH v4 1/5 mptcp: use WRITE_ONCE/READ_ONCE for the pernet *_max
This patch used WRITE_ONCE() and READ_ONCE for all the pernet add_addr_signal_max, add_addr_accept_max, local_addr_max and subflows_max fields in struct pm_nl_pernet.
--- net/mptcp/pm_netlink.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-)
net/mptcp/pm_netlink.c +23 -13
@@ -573,6 +573,7 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet, struct mptcp_pm_addr_entry *entry) {struct mptcp_pm_addr_entry *cur; +unsigned int addr_max;int ret = -EINVAL ;spin_lock_bh (&pernet->lock);
@@ -615,10 +616,14 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,if (entry->addr.id > pernet->next_id) pernet->next_id = entry->addr.id; -if (entry->addr.flags &MPTCP_PM_ADDR_FLAG_SIGNAL ) - pernet->add_addr_signal_max++; -if (entry->addr.flags &MPTCP_PM_ADDR_FLAG_SUBFLOW ) - pernet->local_addr_max++; +if (entry->addr.flags &MPTCP_PM_ADDR_FLAG_SIGNAL ) { + addr_max =READ_ONCE (pernet->add_addr_signal_max); +WRITE_ONCE (pernet->add_addr_signal_max, addr_max +1 ); + } +if (entry->addr.flags &MPTCP_PM_ADDR_FLAG_SUBFLOW ) { + addr_max =READ_ONCE (pernet->local_addr_max); +WRITE_ONCE (pernet->local_addr_max, addr_max +1 ); + } pernet->addrs++;list_add_tail_rcu (&entry->list, &pernet->local_addr_list);
@@ -913,6 +918,7 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR ];struct pm_nl_pernet *pernet =genl_info_pm_nl (info);struct mptcp_pm_addr_entry addr, *entry; +unsigned int addr_max;int ret; ret =mptcp_pm_parse_addr (attr, info, false, &addr);
@@ -926,10 +932,14 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)spin_unlock_bh (&pernet->lock);return -EINVAL ; } -if (entry->addr.flags &MPTCP_PM_ADDR_FLAG_SIGNAL ) - pernet->add_addr_signal_max--; -if (entry->addr.flags &MPTCP_PM_ADDR_FLAG_SUBFLOW ) - pernet->local_addr_max--; +if (entry->addr.flags &MPTCP_PM_ADDR_FLAG_SIGNAL ) { + addr_max =READ_ONCE (pernet->add_addr_signal_max); +WRITE_ONCE (pernet->add_addr_signal_max, addr_max -1 ); + } +if (entry->addr.flags &MPTCP_PM_ADDR_FLAG_SUBFLOW ) { + addr_max =READ_ONCE (pernet->local_addr_max); +WRITE_ONCE (pernet->local_addr_max, addr_max -1 ); + } pernet->addrs--;list_del_rcu (&entry->list);
@@ -957,9 +967,9 @@ static void __flush_addrs(struct net *net, struct list_head *list)static void __reset_counters (struct pm_nl_pernet *pernet) { - pernet->add_addr_signal_max =0 ; - pernet->add_addr_accept_max =0 ; - pernet->local_addr_max =0 ; +WRITE_ONCE (pernet->add_addr_signal_max,0 ); +WRITE_ONCE (pernet->add_addr_accept_max,0 ); +WRITE_ONCE (pernet->local_addr_max,0 ); pernet->addrs =0 ; }
@@ -1131,12 +1141,12 @@ mptcp_nl_cmd_set_limits(struct sk_buff *skb, struct genl_info *info)int ret;spin_lock_bh (&pernet->lock); - rcv_addrs = pernet->add_addr_accept_max; + rcv_addrs =READ_ONCE (pernet->add_addr_accept_max); ret =parse_limit (info,MPTCP_PM_ATTR_RCV_ADD_ADDRS , &rcv_addrs);if (ret) goto unlock; - subflows = pernet->subflows_max; + subflows =READ_ONCE (pernet->subflows_max); ret =parse_limit (info,MPTCP_PM_ATTR_SUBFLOWS , &subflows);if (ret) goto unlock;
Signature · 1 line
2.29.2
Geliang Tang
PATCH v4 2/5 mptcp: drop *_max fields in mptcp_pm_data
This patch dropped the per-msk values add_addr_signal_max, add_addr_accept_max, local_addr_max and subflows_max fields in struct mptcp_pm_data, used the pernet *_max values instead. And added four new helpers to get the pernet *_max values separately.
--- net/mptcp/mptcp_diag.c | 6 +-- net/mptcp/pm.c | 9 +++-- net/mptcp/pm_netlink.c | 87 ++++++++++++++++++++++++++++++------------ net/mptcp/protocol.h | 8 ++-- 4 files changed, 75 insertions(+), 35 deletions(-)
net/mptcp/mptcp_diag.c +3 -3
@@ -128,10 +128,10 @@ static void mptcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r, info->mptcpi_subflows =READ_ONCE (msk->pm.subflows); info->mptcpi_add_addr_signal =READ_ONCE (msk->pm.add_addr_signaled); info->mptcpi_add_addr_accepted =READ_ONCE (msk->pm.add_addr_accepted); - info->mptcpi_subflows_max =READ_ONCE (msk->pm.subflows_max); - val =READ_ONCE (msk->pm.add_addr_signal_max); + info->mptcpi_subflows_max =mptcp_pm_get_subflows_max (msk); + val =mptcp_pm_get_add_addr_signal_max (msk); info->mptcpi_add_addr_signal_max = val; - val =READ_ONCE (msk->pm.add_addr_accept_max); + val =mptcp_pm_get_add_addr_accept_max (msk); info->mptcpi_add_addr_accepted_max = val;if (test_bit (MPTCP_FALLBACK_DONE , &msk->flags)) flags |=MPTCP_INFO_FLAG_FALLBACK ;
net/mptcp/pm.c +6 -3
@@ -78,10 +78,13 @@ void mptcp_pm_new_connection(struct mptcp_sock *msk, int server_side)bool mptcp_pm_allow_new_subflow (struct mptcp_sock *msk) {struct mptcp_pm_data *pm = &msk->pm; +unsigned int subflows_max;int ret =0 ; + subflows_max =mptcp_pm_get_subflows_max (msk); +pr_debug ("msk=%p subflows=%d max=%d allow=%d" , msk, pm->subflows, - pm->subflows_max,READ_ONCE (pm->accept_subflow)); + subflows_max,READ_ONCE (pm->accept_subflow));/* try to avoid acquiring the lock below */ if (!READ_ONCE (pm->accept_subflow))
@@ -89,8 +92,8 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk)spin_lock_bh (&pm->lock);if (READ_ONCE (pm->accept_subflow)) { - ret = pm->subflows < pm->subflows_max; -if (ret && ++pm->subflows == pm->subflows_max) + ret = pm->subflows < subflows_max; +if (ret && ++pm->subflows == subflows_max)WRITE_ONCE (pm->accept_subflow, false); }spin_unlock_bh (&pm->lock);
net/mptcp/pm_netlink.c +62 -25
148 lines not on this page · raw message
net/mptcp/protocol.h +4 -4
@@ -202,10 +202,6 @@ struct mptcp_pm_data {u8 add_addr_accepted;u8 local_addr_used;u8 subflows; -u8 add_addr_signal_max; -u8 add_addr_accept_max; -u8 local_addr_max; -u8 subflows_max;u8 status;u8 rm_id; };
@@ -626,6 +622,10 @@ void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk);void mptcp_pm_nl_rm_addr_received (struct mptcp_sock *msk);void mptcp_pm_nl_rm_subflow_received (struct mptcp_sock *msk,u8 rm_id);int mptcp_pm_nl_get_local_id (struct mptcp_sock *msk,struct sock_common *skc); +unsigned int mptcp_pm_get_add_addr_signal_max (struct mptcp_sock *msk); +unsigned int mptcp_pm_get_add_addr_accept_max (struct mptcp_sock *msk); +unsigned int mptcp_pm_get_local_addr_max (struct mptcp_sock *msk); +unsigned int mptcp_pm_get_subflows_max (struct mptcp_sock *msk);static inline struct mptcp_ext *mptcp_get_ext (struct sk_buff *skb) {
Signature · 1 line
2.29.2
Geliang Tang
PATCH v4 3/5 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 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
net/mptcp/pm_netlink.c +27 -0
@@ -848,6 +848,31 @@ 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_sock *msk; +long s_slot =0 , s_num =0 ; + +while ((msk =mptcp_token_iter_next (net, &s_slot, &s_num)) !=NULL ) { +struct sock *sk = (struct sock *)msk; + +if (!READ_ONCE (msk->fully_established)) + goto next; + +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 ];
@@ -873,6 +898,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)); +return 0 ; }
Signature · 1 line
2.29.2
Geliang Tang
PATCH v4 4/5 selftests: mptcp: use minus values for removing address numbers
This patch changed the removing addresses numbers to minus values, left the plus values for the adding addresses numbers.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +17 -15
@@ -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
@@ -677,7 +679,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
@@ -687,7 +689,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
@@ -696,7 +698,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
@@ -707,7 +709,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
@@ -719,7 +721,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
@@ -731,7 +733,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
@@ -774,7 +776,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
@@ -785,7 +787,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
Signature · 1 line
2.29.2
Geliang Tang
PATCH v4 5/5 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
@@ -738,6 +770,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