9:40 a.m.
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.
Signed-off-by: Geliang Tang <geliangtang(a)gmail.com>
---
net/mptcp/pm_netlink.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 987e83cdee11..2614d3e80ab6 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -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;
}
--
2.29.2