Commit 40947e13 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

mptcp: schedule worker when subflow is closed 



When remote side closes a subflow we should schedule the worker to
dispose of the subflow in a timely manner.

Otherwise, SF_CLOSED event won't be generated until the mptcp
socket itself is closing or local side is closing another subflow.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a141e02e

net/mptcp/protocol.c

+4 −0
Original line number Diff line number Diff line
@@ -2170,6 +2170,10 @@ static void __mptcp_close_subflow(struct mptcp_sock *msk) 
		if (inet_sk_state_load(ssk) != TCP_CLOSE)

			continue;



		/* 'subflow_data_ready' will re-sched once rx queue is empty */

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

			continue;



		mptcp_close_ssk((struct sock *)msk, ssk, subflow);

	}

}

net/mptcp/subflow.c

+23 −2
Original line number Diff line number Diff line
@@ -953,6 +953,22 @@ 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 void subflow_sched_work_if_closed(struct mptcp_sock *msk, struct sock *ssk)

{

	struct sock *sk = (struct sock *)msk;



	if (likely(ssk->sk_state != TCP_CLOSE))

		return;



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

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

		sock_hold(sk);

		if (!schedule_work(&msk->work))

			sock_put(sk);

	}

}



static bool subflow_check_data_avail(struct sock *ssk)

{

	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
@@ -991,11 +1007,11 @@ static bool subflow_check_data_avail(struct sock *ssk) 
		}



		if (status != MAPPING_OK)

			return false;

			goto no_data;



		skb = skb_peek(&ssk->sk_receive_queue);

		if (WARN_ON_ONCE(!skb))

			return false;

			goto no_data;



		/* if msk lacks the remote key, this subflow must provide an

		 * MP_CAPABLE-based mapping
@@ -1029,6 +1045,9 @@ static bool subflow_check_data_avail(struct sock *ssk) 
	}

	return true;



no_data:

	subflow_sched_work_if_closed(msk, ssk);

	return false;

fatal:

	/* fatal protocol error, close the socket */

	/* This barrier is coupled with smp_rmb() in tcp_poll() */
@@ -1413,6 +1432,8 @@ static void subflow_state_change(struct sock *sk) 
	if (mptcp_subflow_data_available(sk))

		mptcp_data_ready(parent, sk);



	subflow_sched_work_if_closed(mptcp_sk(parent), sk);



	if (__mptcp_check_fallback(mptcp_sk(parent)) &&

	    !subflow->rx_eof && subflow_is_done(sk)) {

		subflow->rx_eof = 1;