Commit c3349a22 authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

mptcp: consolidate subflow cleanup 



Consolidate all the cleanup actions requiring the worker in a single
helper and ensure the dummy data fin creation for fallback socket is
performed only when the tcp rx queue is empty.

There are no functional changes intended, but this will simplify the
next patch, when the tcp rx queue spooling could be delayed at release_cb
time.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250218-net-next-mptcp-rx-path-refactor-v1-1-4a47d90d7998@kernel.org


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

net/mptcp/subflow.c

+18 −15
Original line number Diff line number Diff line
@@ -1271,7 +1271,12 @@ static void mptcp_subflow_discard_data(struct sock *ssk, struct sk_buff *skb, 
		subflow->map_valid = 0;

}



/* sched mptcp worker to remove the subflow if no more data is pending */

static bool subflow_is_done(const struct sock *sk)

{

	return sk->sk_shutdown & RCV_SHUTDOWN || sk->sk_state == TCP_CLOSE;

}



/* sched mptcp worker for subflow cleanup if no more data is pending */

static void subflow_sched_work_if_closed(struct mptcp_sock *msk, struct sock *ssk)

{

	struct sock *sk = (struct sock *)msk;
@@ -1281,8 +1286,18 @@ static void subflow_sched_work_if_closed(struct mptcp_sock *msk, struct sock *ss 
		    inet_sk_state_load(sk) != TCP_ESTABLISHED)))

		return;



	if (skb_queue_empty(&ssk->sk_receive_queue) &&

	    !test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags))

	if (!skb_queue_empty(&ssk->sk_receive_queue))

		return;



	if (!test_and_set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags))

		mptcp_schedule_work(sk);



	/* when the fallback subflow closes the rx side, trigger a 'dummy'

	 * ingress data fin, so that the msk state will follow along

	 */

	if (__mptcp_check_fallback(msk) && subflow_is_done(ssk) &&

	    msk->first == ssk &&

	    mptcp_update_rcv_data_fin(msk, READ_ONCE(msk->ack_seq), true))

		mptcp_schedule_work(sk);

}
@@ -1842,11 +1857,6 @@ static void __subflow_state_change(struct sock *sk) 
	rcu_read_unlock();

}



static bool subflow_is_done(const struct sock *sk)

{

	return sk->sk_shutdown & RCV_SHUTDOWN || sk->sk_state == TCP_CLOSE;

}



static void subflow_state_change(struct sock *sk)

{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
@@ -1873,13 +1883,6 @@ static void subflow_state_change(struct sock *sk) 
		subflow_error_report(sk);



	subflow_sched_work_if_closed(mptcp_sk(parent), sk);



	/* when the fallback subflow closes the rx side, trigger a 'dummy'

	 * ingress data fin, so that the msk state will follow along

	 */

	if (__mptcp_check_fallback(msk) && subflow_is_done(sk) && msk->first == sk &&

	    mptcp_update_rcv_data_fin(msk, READ_ONCE(msk->ack_seq), true))

		mptcp_schedule_work(parent);

}



void mptcp_subflow_queue_clean(struct sock *listener_sk, struct sock *listener_ssk)