Message ID | 20180306221512.119943-1-soheil.kdev@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | [net] tcp: purge write queue upon aborting the connection | expand |
From: Soheil Hassas Yeganeh <soheil.kdev@gmail.com> Date: Tue, 6 Mar 2018 17:15:12 -0500 > From: Soheil Hassas Yeganeh <soheil@google.com> > > When the connection is aborted, there is no point in > keeping the packets on the write queue until the connection > is closed. > > Similar to a27fd7a8ed38 ('tcp: purge write queue upon RST'), > this is essential for a correct MSG_ZEROCOPY implementation, > because userspace cannot call close(fd) before receiving > zerocopy signals even when the connection is aborted. > > Fixes: f214f915e7db ("tcp: enable MSG_ZEROCOPY") > Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com> > Signed-off-by: Neal Cardwell <ncardwell@google.com> > Reviewed-by: Eric Dumazet <edumazet@google.com> > Signed-off-by: Yuchung Cheng <ycheng@google.com> Applied and queued up for -stable, thanks.
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 48636aee23c3..8b8059b7af4d 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3566,6 +3566,7 @@ int tcp_abort(struct sock *sk, int err) bh_unlock_sock(sk); local_bh_enable(); + tcp_write_queue_purge(sk); release_sock(sk); return 0; } diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 71fc60f1b326..f7d944855f8e 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -34,6 +34,7 @@ static void tcp_write_err(struct sock *sk) sk->sk_err = sk->sk_err_soft ? : ETIMEDOUT; sk->sk_error_report(sk); + tcp_write_queue_purge(sk); tcp_done(sk); __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPABORTONTIMEOUT); }