Commit f14d6e9c authored by Matthieu Baerts (NGI0)'s avatar Matthieu Baerts (NGI0) Committed by Jakub Kicinski
Browse files

mptcp: fastclose msk when linger time is 0 



The SO_LINGER socket option has been supported for a while with MPTCP
sockets [1], but it didn't cause the equivalent of a TCP reset as
expected when enabled and its time was set to 0. This was causing some
behavioural differences with TCP where some connections were not
promptly stopped as expected.

To fix that, an extra condition is checked at close() time before
sending an MP_FASTCLOSE, the MPTCP equivalent of a TCP reset.

Note that backporting up to [1] will be difficult as more changes are
needed to be able to send MP_FASTCLOSE. It seems better to stop at [2],
which was supposed to already imitate TCP.

Validated with MPTCP packetdrill tests [3].

Fixes: 268b1238 ("mptcp: setsockopt: support SO_LINGER") [1]
Fixes: d21f8348 ("mptcp: use fastclose on more edge scenarios") [2]
Cc: stable@vger.kernel.org
Reported-by: default avatarLance Tuller <lance@lance0.com>
Closes: https://github.com/lance0/xfr/pull/67
Link: https://github.com/multipath-tcp/packetdrill/pull/196

 [3]
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20260427-net-mptcp-misc-fixes-7-1-rc2-v1-3-7432b7f279fa@kernel.org


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

net/mptcp/protocol.c

+2 −1
Original line number Diff line number Diff line
@@ -3302,7 +3302,8 @@ bool __mptcp_close(struct sock *sk, long timeout) 
		goto cleanup;

	}



	if (mptcp_data_avail(msk) || timeout < 0) {

	if (mptcp_data_avail(msk) || timeout < 0 ||

	    (sock_flag(sk, SOCK_LINGER) && !sk->sk_lingertime)) {

		/* If the msk has read data, or the caller explicitly ask it,

		 * do the MPTCP equivalent of TCP reset, aka MPTCP fastclose

		 */