Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ECD4C43387 for ; Thu, 17 Jan 2019 19:24:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E5C920859 for ; Thu, 17 Jan 2019 19:24:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="fzYqC5Vq" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728587AbfAQTYF (ORCPT ); Thu, 17 Jan 2019 14:24:05 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:33147 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728570AbfAQTYD (ORCPT ); Thu, 17 Jan 2019 14:24:03 -0500 Received: by mail-pg1-f195.google.com with SMTP id z11so4874804pgu.0 for ; Thu, 17 Jan 2019 11:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C+tAZLIJRdKrZe8u1mlMNpAYHQzaJ0CVyBU8x9p28tk=; b=fzYqC5VqFcDPHiC0+5u3R36xlbHIuixJ5eBQ3rIxD6PG+Y34wZyTP0hocUcYkUHBQk OiiepdQXla3jsfKpJ/6ZR4jxJAbGEQPzO7qwr5OzBtvIcHSMgzZ7mL4NSKSdgX2+sc6s kZ9uzUCdhihQmlo5axvDadRmRi49neB9Qau32Cdr2M9ijWLWjJ8Zn52aEUut37COMPXb ZeLO/r1xpleTWeLcKwkUJrgdtvIiArmHPNj1QZcjUjhv9kCKymESia3Eit9t260jKm3+ Y6yD7gqbCVtFx3WeAPMPxgT5bKhTr7D+LCmk2h9YE6y2c8XtkIjOTuvwUeZl2ujU+mUT IdcA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=C+tAZLIJRdKrZe8u1mlMNpAYHQzaJ0CVyBU8x9p28tk=; b=nK9oXQq/htdwMcqMrbxEjwJURR5WsDwzsLMMCrDDBLA6Wf/PHGKxAi0+K29lwc1+6J P1lrNLjNWgojBP+L6n6LPXS0WBtpCA2G15CZHqwNeJ9Tu5hMbem+ercGQbszrlhy+BVF FV8M1w6bBnrFJ0kN7OVdVF2FMXlw9kfCVUl2KZ1r0JPNDZMHvzXh0hPLXSOrEJbXMlUo lrFkgFE4cWOLW55xh4MhrIvlG9V47j4uehZbHorZQR2eDuCyF64GiWGDb/eOXUm//Fyy OA3u8CWyDjGgehQizGOiBhzCvda+53IFXIGc1qYzTFKmXTJC77/S8Fo97GJXFzSIatOM pHHQ== X-Gm-Message-State: AJcUukfHHeV4gaa7hn/x2F1ZlIU/EVfJgi+Dlffm2MUTUMdVvjZPRfbs DPmSRW98jhmY7YKqo9xRd1Vgdw== X-Google-Smtp-Source: ALg8bN6XPrDeNt1Gq4QD3RX47h/IcNmj5Bds072fPcpXnxxyldKZkAo4SrtucOREp9rw9dlLNxXnOQ== X-Received: by 2002:a62:29c3:: with SMTP id p186mr16391039pfp.117.1547753042022; Thu, 17 Jan 2019 11:24:02 -0800 (PST) Received: from localhost ([2620:15c:2c4:201:f5a:7eca:440a:3ead]) by smtp.gmail.com with ESMTPSA id l184sm4247468pfc.112.2019.01.17.11.24.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Jan 2019 11:24:01 -0800 (PST) From: Eric Dumazet To: "David S . Miller" Cc: netdev , Soheil Hassas Yeganeh , Neal Cardwell , Yuchung Cheng , Eric Dumazet , Eric Dumazet Subject: [PATCH net-next 08/11] tcp: move retrans_out,sacked_out,tlp_high_seq,last_oow_ack_time init to tcp_disconnect() Date: Thu, 17 Jan 2019 11:23:39 -0800 Message-Id: <20190117192342.71126-9-edumazet@google.com> X-Mailer: git-send-email 2.20.1.321.g9e740568ce-goog In-Reply-To: <20190117192342.71126-1-edumazet@google.com> References: <20190117192342.71126-1-edumazet@google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If we make sure all listeners have these fields cleared, then a clone will also inherit zero values. Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 4 ++++ net/ipv4/tcp_minisocks.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 3f99ad92eaedb2364e339842365f553fca8922e1..551ad8604bea0cb459805165bb216a99fd3bd8e2 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2605,6 +2605,10 @@ int tcp_disconnect(struct sock *sk, int flags) tp->duplicate_sack[0].end_seq = 0; tp->dsack_dups = 0; tp->reord_seen = 0; + tp->retrans_out = 0; + tp->sacked_out = 0; + tp->tlp_high_seq = 0; + tp->last_oow_ack_time = 0; /* Clean up fastopen related fields */ tcp_free_fastopen_req(tp); diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 2747aa72b8e2b5c190c2c3e68a7dea04ee97dcac..29fba13849a79695b3f62a989b27157b57caedfb 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -482,12 +482,8 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, minmax_reset(&newtp->rtt_min, tcp_jiffies32, ~0U); newicsk->icsk_ack.lrcvtime = tcp_jiffies32; - newtp->retrans_out = 0; - newtp->sacked_out = 0; - newtp->tlp_high_seq = 0; newtp->lsndtime = tcp_jiffies32; newsk->sk_txhash = treq->txhash; - newtp->last_oow_ack_time = 0; newtp->total_retrans = req->num_retrans; /* There's a bubble in the pipe until at least the first ACK. */ -- 2.20.1.321.g9e740568ce-goog