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 5616AC43387 for ; Thu, 17 Jan 2019 19:23:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21E3820859 for ; Thu, 17 Jan 2019 19:23:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rc4Iug0J" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728454AbfAQTXv (ORCPT ); Thu, 17 Jan 2019 14:23:51 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:44405 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726811AbfAQTXv (ORCPT ); Thu, 17 Jan 2019 14:23:51 -0500 Received: by mail-pl1-f193.google.com with SMTP id e11so5167852plt.11 for ; Thu, 17 Jan 2019 11:23:50 -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=/ctxZfg3TRQGFzaG7Ffmpf692LcU/EVHXP4CpD7kyh0=; b=rc4Iug0J2LuUDZfiWUGry865HmqiKNoQ4bvePA6YD+pzC7rauzZXTOoi+2cyavYElv VO8KO8EqB8wpUkWp44R/Cjlvsry1vGNv4189CEjdJlikNaAa+8Rls+Xvm0jzW24CwQ7A djGp2S4tuWptAgmpVqO7BRLUfaKiuLkfKPYFJG3FLq7dNY0i3E5+pwTwIkmbZ6tRMik7 ZIONi93sKvn1pa5yNXgB3wYWRSghN6HkLY0Q7Zmklr5RtXLhfAGjIPolFcZdxsMcqVJX TMSzUoeBI8JYDd13XLohAdAEFdcNyOCG96hoU/D3rOriAnBIXcVti2hq7NCXY+XOCbYJ 3rAA== 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=/ctxZfg3TRQGFzaG7Ffmpf692LcU/EVHXP4CpD7kyh0=; b=T9XSCpYgYsMh2jmRgx+76Uu72T5on/Vguu0p69qp7x7uVWtdAe+Sne92KtXXyBycTl YWshC8Df32GwivgDNdV4igGvpJbreW6ZBQip5IphHdn5E9MFjMe02aVfGhHOioHYqmfI PyLrvBxs44S5DTWZCVfTBxi2lTMhX95ZukMseIskJuBODkz1LqSr4gUvyl1fC4rKJ1Ns QNUY4InyFJ3uASfZZQ4uPHAaPPIoMVi4djPMvPQ28jDJ3+pHEfN4/DXsWvGOiXn7mlo2 lDcIhErc+IEVdlEYud+5fl2QVnIRFNxIm1bJSTtVFJBJpYMGhQY8jdmqS1C8mqXWt2w4 fmHw== X-Gm-Message-State: AJcUukdgkydL9hbCOZ1DaULjlj9kg+dIRBwORWDs8MrT8Yg01FRVrqRG sO56oUjauPLB18JjtEsdOIZBzQ== X-Google-Smtp-Source: ALg8bN4egFtqutAyYvelL3l52yE4seoeA11hGUYcKpX+wDY0kjZmMX2g4t/tfmFUL+YGR++GWIQAcg== X-Received: by 2002:a17:902:780c:: with SMTP id p12mr15836797pll.197.1547753030199; Thu, 17 Jan 2019 11:23:50 -0800 (PST) Received: from localhost ([2620:15c:2c4:201:f5a:7eca:440a:3ead]) by smtp.gmail.com with ESMTPSA id r8sm3354532pgu.38.2019.01.17.11.23.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 17 Jan 2019 11:23:49 -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 02/11] tcp: move icsk_rto init to tcp_disconnect() Date: Thu, 17 Jan 2019 11:23:33 -0800 Message-Id: <20190117192342.71126-3-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 a listener always has its icsk_rto field set to TCP_TIMEOUT_INIT, we do not need to rewrite this field after a new clone is created. tcp_disconnect() is very seldom used in real applications. Signed-off-by: Eric Dumazet --- net/ipv4/tcp.c | 1 + net/ipv4/tcp_minisocks.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 27e2f6837062374baaea267a8788b9fd91db25ff..9d8131f95a9732fb873c8a8b2c918657e1dade30 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2579,6 +2579,7 @@ int tcp_disconnect(struct sock *sk, int flags) icsk->icsk_backoff = 0; tp->snd_cwnd = 2; icsk->icsk_probes_out = 0; + icsk->icsk_rto = TCP_TIMEOUT_INIT; tp->snd_ssthresh = TCP_INFINITE_SSTHRESH; tp->snd_cwnd_cnt = 0; tp->window_clamp = 0; diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 0cffa5937b1261984c3986b107220af495264437..9799f1d32e44f4c733b41c4d8fc7739970ccca28 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -482,7 +482,6 @@ struct sock *tcp_create_openreq_child(const struct sock *sk, newtp->srtt_us = 0; newtp->mdev_us = jiffies_to_usecs(TCP_TIMEOUT_INIT); minmax_reset(&newtp->rtt_min, tcp_jiffies32, ~0U); - newicsk->icsk_rto = TCP_TIMEOUT_INIT; newicsk->icsk_ack.lrcvtime = tcp_jiffies32; newtp->packets_out = 0; -- 2.20.1.321.g9e740568ce-goog