@@ -265,7 +265,7 @@ void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk)
struct mptcp_subflow_context *subflow, *tmp;
struct sock *sk = (struct sock *)msk;
- pr_debug("rm_id %d", msk->pm.rm_id);
+ pr_debug("address rm_id %d", msk->pm.rm_id);
if (!msk->pm.rm_id)
return;
@@ -273,23 +273,56 @@ void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk)
if (list_empty(&msk->conn_list))
return;
- msk->pm.add_addr_accepted--;
- msk->pm.subflows--;
- WRITE_ONCE(msk->pm.accept_addr, true);
+ list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
+ struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
+ int how = RCV_SHUTDOWN | SEND_SHUTDOWN;
+ long timeout = 0;
+
+ if (msk->pm.rm_id != subflow->remote_id)
+ continue;
+
+ spin_unlock_bh(&msk->pm.lock);
+ mptcp_subflow_shutdown(sk, ssk, how);
+ __mptcp_close_ssk(sk, ssk, subflow, timeout);
+ spin_lock_bh(&msk->pm.lock);
+
+ msk->pm.add_addr_accepted--;
+ msk->pm.subflows--;
+ WRITE_ONCE(msk->pm.accept_addr, true);
+
+ break;
+ }
+}
+
+void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, u8 rm_id)
+{
+ struct mptcp_subflow_context *subflow, *tmp;
+ struct sock *sk = (struct sock *)msk;
+
+ pr_debug("subflow rm_id %d", rm_id);
+
+ if (!rm_id)
+ return;
+
+ if (list_empty(&msk->conn_list))
+ return;
list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
int how = RCV_SHUTDOWN | SEND_SHUTDOWN;
long timeout = 0;
- if (msk->pm.rm_id != subflow->remote_id &&
- msk->pm.rm_id != subflow->local_id)
+ if (rm_id != subflow->local_id)
continue;
spin_unlock_bh(&msk->pm.lock);
mptcp_subflow_shutdown(sk, ssk, how);
__mptcp_close_ssk(sk, ssk, subflow, timeout);
spin_lock_bh(&msk->pm.lock);
+
+ msk->pm.local_addr_used--;
+ msk->pm.subflows--;
+
break;
}
}
@@ -477,6 +477,7 @@ void mptcp_pm_nl_fully_established(struct mptcp_sock *msk);
void mptcp_pm_nl_subflow_established(struct mptcp_sock *msk);
void mptcp_pm_nl_add_addr_received(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);
static inline struct mptcp_ext *mptcp_get_ext(struct sk_buff *skb)
We want to use mptcp_pm_nl_rm_addr_received to deal with both removing an address and removing a subflow. But it not work. Here is the problem: Suppose there are three subflows, 1 local_id=0 remote_id=0 2 local_id=0 remote_id=1 3 local_id=1 remote_id=0. Here we want to remove the local subflow, the No.3 subflow, so we passed msk->pm.rm_id=1 to mptcp_pm_nl_rm_addr_received. According to this logic, if (msk->pm.rm_id != subflow->remote_id && msk->pm.rm_id != subflow->local_id) We removed the wrong subflow, the No.2 subflow. So we need to deal with removing an address and removing a subflow separately. We check subflow->remote_id in mptcp_pm_nl_rm_addr_received to remove an address and check subflow->local_id in mptcp_pm_nl_rm_subflow_received to remove a subflow. Suggested-by: Matthieu Baerts <matthieu.baerts@tessares.net> Suggested-by: Paolo Abeni <pabeni@redhat.com> Suggested-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- net/mptcp/pm_netlink.c | 45 ++++++++++++++++++++++++++++++++++++------ net/mptcp/protocol.h | 1 + 2 files changed, 40 insertions(+), 6 deletions(-)