Commit 5add80bf authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: implement mptcp_pm_connection_closed 



The MPTCP path manager event handler mptcp_pm_connection_closed
interface has been added in the commit 1b1c7a0e ("mptcp: Add path
manager interface") but it was an empty function from then on.

With such name, it sounds good to invoke mptcp_event with the
MPTCP_EVENT_CLOSED event type from it. It also removes a bit of
duplicated code.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20241021-net-next-mptcp-misc-6-13-v1-3-1ef02746504a@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 581c8cbf

net/mptcp/pm.c

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,9 @@ void mptcp_pm_fully_established(struct mptcp_sock *msk, const struct sock *ssk) 
void mptcp_pm_connection_closed(struct mptcp_sock *msk)

{

	pr_debug("msk=%p\n", msk);



	if (msk->token)

		mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);

}



void mptcp_pm_subflow_established(struct mptcp_sock *msk)

net/mptcp/protocol.c

+2 −4
Original line number Diff line number Diff line
@@ -3139,8 +3139,7 @@ bool __mptcp_close(struct sock *sk, long timeout) 


	sock_hold(sk);

	pr_debug("msk=%p state=%d\n", sk, sk->sk_state);

	if (msk->token)

		mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);

	mptcp_pm_connection_closed(msk);



	if (sk->sk_state == TCP_CLOSE) {

		__mptcp_destroy_sock(sk);
@@ -3206,8 +3205,7 @@ static int mptcp_disconnect(struct sock *sk, int flags) 
	mptcp_stop_rtx_timer(sk);

	mptcp_stop_tout_timer(sk);



	if (msk->token)

		mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);

	mptcp_pm_connection_closed(msk);



	/* msk->subflow is still intact, the following will not free the first

	 * subflow