From patchwork Tue Mar 6 22:15:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Soheil Hassas Yeganeh X-Patchwork-Id: 882307 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lcpRasFY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zwrgd1Gkzz9sh9 for ; Wed, 7 Mar 2018 09:15:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754130AbeCFWPX (ORCPT ); Tue, 6 Mar 2018 17:15:23 -0500 Received: from mail-qk0-f196.google.com ([209.85.220.196]:34680 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754097AbeCFWPV (ORCPT ); Tue, 6 Mar 2018 17:15:21 -0500 Received: by mail-qk0-f196.google.com with SMTP id l206so311674qke.1 for ; Tue, 06 Mar 2018 14:15:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KxYmYpGcskogUd3VMyj0OvRzmfXifFlE8AE+NVywnYM=; b=lcpRasFYQ6qs8btaqo1lKHRxoeTNXQpekts4kX8osm++cC1hQce2eSQV98DfSNKWRJ RpnhbsJrE2GYesvMsbpvoLuhsOfDJ19FwYeot6hOcauoIVpBV/Ay8xaNT3hHETMJqSTF R7488unxvcQC0vqyb2C+iV8B2dUrOd0l1B98HNzkj5qEqE5zWkZq6fExY/TiPpCfNwca P1ybYWNRmYFlK60clZJJ6zJh3k4K4HwSongQiT6LJbZjHzqLyEt7+vJOAjm+7FnRf9dw v129R0GuwliIKAx/7aU19wetvL4CTsPjKyiMlw2nk2+RsAhbFygDp8cZtjOltrSXQSUE +C1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KxYmYpGcskogUd3VMyj0OvRzmfXifFlE8AE+NVywnYM=; b=kWMwrstKKdLc500YPCMQLiFQXmx+xlyplPPb3ArPaUe6vXSJOVvFyKgFjSDV1gp3Aq 8uX4HYZ3zfTp1Ur+qMv5CrbJGSGoM8hnqFve5pluNpDm1TqpiOrVmbvwFGcbrul7pQ0p iLyuwI1DabLEOksEnnPz/+1qV4LwVSiECWjX9OclGJ9xVwOcwqJfsyXkWB6XNvckCBTE n8pbPbYEMB30UREqXQ3RxNnVN1Mtr7YM239r/pmEbitwkHZz00/KJGh3Qbrn2pH9YIdJ t3IR6cQG7JPQ2AwJCOzbnTd/R8Ut5u5G1KTZfiLaEsY6edzFkAfuJs0QuBiLVvhdLlcw zuXQ== X-Gm-Message-State: AElRT7HEfBwTtRTPJx1MTXJXEAtWTZYyZB1yUKo5nICmdrwVv9LnT0yz JlDl3QavKKghc6n5rZu1hUomM+oK X-Google-Smtp-Source: AG47ELuEOzxbhyd2nJNFVp8AV7spM63e5neejYqh49jVTLOnjZMHkiWaj1JmxaLN4Ti3Vy3ym8sucw== X-Received: by 10.55.94.69 with SMTP id s66mr10655434qkb.119.1520374521172; Tue, 06 Mar 2018 14:15:21 -0800 (PST) Received: from z.nyc.corp.google.com ([2620:0:1003:315:9c67:ffa0:44c0:d273]) by smtp.gmail.com with ESMTPSA id d36sm11300082qtk.47.2018.03.06.14.15.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Mar 2018 14:15:20 -0800 (PST) From: Soheil Hassas Yeganeh To: davem@davemloft.net, netdev@vger.kernel.org Cc: willemb@google.com, Soheil Hassas Yeganeh , Neal Cardwell , Yuchung Cheng Subject: [PATCH net] tcp: purge write queue upon aborting the connection Date: Tue, 6 Mar 2018 17:15:12 -0500 Message-Id: <20180306221512.119943-1-soheil.kdev@gmail.com> X-Mailer: git-send-email 2.16.2.395.g2e18187dfd-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Soheil Hassas Yeganeh 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 Signed-off-by: Neal Cardwell Reviewed-by: Eric Dumazet Signed-off-by: Yuchung Cheng --- net/ipv4/tcp.c | 1 + net/ipv4/tcp_timer.c | 1 + 2 files changed, 2 insertions(+) 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); }