Content-Type: multipart/mixed; boundary="===============8592376037716915075==" MIME-Version: 1.0 From: Florian Westphal To: mptcp at lists.01.org Subject: [MPTCP] [PATCH mptcp 3/7] mptcp: split __mptcp_close_ssk helper Date: Thu, 14 Jan 2021 18:36:50 +0100 Message-ID: <20210114173654.7618-4-fw@strlen.de> In-Reply-To: 20210114173654.7618-1-fw@strlen.de X-Status: X-Keywords: X-UID: 7384 --===============8592376037716915075== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Prepare for subflow close events: When mptcp connection is torn down its enough to send the mptcp socket close notification rather than a subflow close event for all of the subflows followed by the mptcp close event. This splits the helper: mptcp_close_ssk() will emit the close notification, __mptcp_close_ssk will not. Signed-off-by: Florian Westphal --- net/mptcp/pm_netlink.c | 4 ++-- net/mptcp/protocol.c | 12 +++++++++--- net/mptcp/protocol.h | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 214b429bf3b8..8d0628590ca8 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -512,7 +512,7 @@ static void mptcp_pm_nl_rm_addr_received(struct mptcp_s= ock *msk) = spin_unlock_bh(&msk->pm.lock); mptcp_subflow_shutdown(sk, ssk, how); - __mptcp_close_ssk(sk, ssk, subflow); + mptcp_close_ssk(sk, ssk, subflow); spin_lock_bh(&msk->pm.lock); = msk->pm.add_addr_accepted--; @@ -582,7 +582,7 @@ void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock = *msk, u8 rm_id) = spin_unlock_bh(&msk->pm.lock); mptcp_subflow_shutdown(sk, ssk, how); - __mptcp_close_ssk(sk, ssk, subflow); + mptcp_close_ssk(sk, ssk, subflow); spin_lock_bh(&msk->pm.lock); = msk->pm.local_addr_used--; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b1e152196057..ecf440b7ec40 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2097,8 +2097,8 @@ static struct sock *mptcp_subflow_get_retrans(const s= truct mptcp_sock *msk) * so we need to use tcp_close() after detaching them from the mptcp * parent socket. */ -void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, - struct mptcp_subflow_context *subflow) +static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, + struct mptcp_subflow_context *subflow) { list_del(&subflow->node); = @@ -2130,6 +2130,12 @@ void __mptcp_close_ssk(struct sock *sk, struct sock = *ssk, sock_put(ssk); } = +void mptcp_close_ssk(struct sock *sk, struct sock *ssk, + struct mptcp_subflow_context *subflow) +{ + __mptcp_close_ssk(sk, ssk, subflow); +} + static unsigned int mptcp_sync_mss(struct sock *sk, u32 pmtu) { return 0; @@ -2147,7 +2153,7 @@ static void __mptcp_close_subflow(struct mptcp_sock *= msk) if (inet_sk_state_load(ssk) !=3D TCP_CLOSE) continue; = - __mptcp_close_ssk((struct sock *)msk, ssk, subflow); + mptcp_close_ssk((struct sock *)msk, ssk, subflow); } } = diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 914722b646b3..ac83cc50c981 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -475,8 +475,8 @@ void mptcp_subflow_fully_established(struct mptcp_subfl= ow_context *subflow, bool mptcp_subflow_data_available(struct sock *sk); void __init mptcp_subflow_init(void); void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how); -void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, - struct mptcp_subflow_context *subflow); +void mptcp_close_ssk(struct sock *sk, struct sock *ssk, + struct mptcp_subflow_context *subflow); void mptcp_subflow_reset(struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); = -- = 2.26.2 --===============8592376037716915075==--