Commit d09d818e authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: add a missing retransmission timer scheduling 



Currently we do not schedule the MPTCP retransmission
timer after pushing the data when such action happens
in the subflow context.

This may cause hang-up on active-backup scenarios, or
even when only single subflow msks are involved, if we lost
some peer's ack.

Fixes: 6e628cd3 ("mptcp: use mptcp release_cb for delayed tasks")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3859603

net/mptcp/options.c

+1 −2
Original line number Diff line number Diff line
@@ -880,8 +880,7 @@ static void ack_update_msk(struct mptcp_sock *msk, 
		msk->wnd_end = new_wnd_end;



	/* this assumes mptcp_incoming_options() is invoked after tcp_ack() */

	if (after64(msk->wnd_end, READ_ONCE(msk->snd_nxt)) &&

	    sk_stream_memory_free(ssk))

	if (after64(msk->wnd_end, READ_ONCE(msk->snd_nxt)))

		__mptcp_check_push(sk, ssk);



	if (after64(new_snd_una, old_snd_una)) {

net/mptcp/protocol.c

+3 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,9 @@ static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk) 
		mptcp_set_timeout(sk, ssk);

		tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle,

			 info.size_goal);

		if (!mptcp_timer_pending(sk))

			mptcp_reset_timer(sk);



		if (msk->snd_data_fin_enable &&

		    msk->snd_nxt + 1 == msk->write_seq)

			mptcp_schedule_work(sk);