mptcp: fastclose msk when cleaning unaccepted sockets

When cleaning up unaccepted mptcp socket still laying inside
the listener queue at listener close time, such sockets will
go through a regular close, waiting for a timeout before
shutting down the subflows.

There is no need to keep the kernel resources in use for
such a possibly long time: short-circuit to fast-close.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index a676ac1bb9f1da649ca4858eb51601c6ecec6476..1926b81a9538b535e4ddcc5dc87b45f53276cd66 100644 (file)
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -2953,10 +2953,13 @@ bool __mptcp_close(struct sock *sk, long timeout)
                goto cleanup;
        }
 
-       if (mptcp_check_readable(msk)) {
-               /* the msk has read data, do the MPTCP equivalent of TCP reset */
+       if (mptcp_check_readable(msk) || timeout < 0) {
+               /* If the msk has read data, or the caller explicitly ask it,
+                * do the MPTCP equivalent of TCP reset, aka MPTCP fastclose
+                */
                inet_sk_state_store(sk, TCP_CLOSE);
                mptcp_do_fastclose(sk);
+               timeout = 0;
        } else if (mptcp_close_state(sk)) {
                __mptcp_wr_shutdown(sk);
        }