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 03897C43387 for ; Wed, 16 Jan 2019 23:06:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C26B720675 for ; Wed, 16 Jan 2019 23:06:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jOkPxWm8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387958AbfAPXF7 (ORCPT ); Wed, 16 Jan 2019 18:05:59 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:45626 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387947AbfAPXF6 (ORCPT ); Wed, 16 Jan 2019 18:05:58 -0500 Received: by mail-pl1-f196.google.com with SMTP id a14so3718092plm.12 for ; Wed, 16 Jan 2019 15:05:58 -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=YZNkXrN5sHGZEc2lfkfn6bRtfB+l3g+mYllBUgR11uM=; b=jOkPxWm8nFIqzxmJUH0Ebt27GBuiJOVmoJX1B/UV+sVE4qdO56OJMJCshgPLC92pdi 9EKZU54OL2FrFgcWXU/A62+w+Lact/RdzmmXmuhXMrSAwgQTbHWIDD5bls9S/URIYRBJ zwu+zL4lVvfdfL90rcL5HKsf04pNbTpqRNFhzGEupULFw9yT/P5wI9fZOT/VGpW7qya6 wadtkZfDWqjHF458sD0Gr+z885pO46StOJJcc/DxF0RuaRX7jYItIbxRb32h+pmh1d+E Nuxmd082byWluYcepnWZSAcP9PX2VQS+dgURb5+xtx1sEJ9H3xIsFPXJLz7QnMHbU68A yqrg== 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=YZNkXrN5sHGZEc2lfkfn6bRtfB+l3g+mYllBUgR11uM=; b=BVBZ1+JKciE8VXwyOaNIvtNpE6JVUxWx3dNJwptOH6SycjDs5GpB88BBkPLCv3Tt8B PESbZlkAWHkbHLOyCF/YdssagjOfmX60AaAQqkcgEsOqkEnlCxUTbrOOGFaVK1j4ZXvZ J1nwGDKtT9FYbZjTh5QZcWUEqtrFtTPB1ru6I206yqyUhHGmbNnbXdbgGE3vyjlHvUen 6p8cBRdlLLM0Qbhf6GdXT3VtwyRtbQ/FZSyjNCkE39wdLxJKmbOq/sFNvCAe55eYoDRu o8GF8GjGk7+UWULbqhdZMICmB6Z86fNylWSpMK1kM7almJppNVRyrUlEQ6/Xk4HGrktC 99Mg== X-Gm-Message-State: AJcUukcrfYEJVnHcw/7mYDBjAkWvBevuymh94sPuHh+nZ2e12ZhbwbC0 ezEfe/wI4jgEaTBb8umYbFqdTgrj0tcg5Q== X-Google-Smtp-Source: ALg8bN73btZ9qezpgQFwZdU332oSItzwBz/wKj+yBQyl48k3gt88l3VhDmnctTde2PANdKPpUNb0Eg== X-Received: by 2002:a17:902:9a02:: with SMTP id v2mr12650064plp.180.1547679957867; Wed, 16 Jan 2019 15:05:57 -0800 (PST) Received: from ycheng2.svl.corp.google.com ([2620:15c:2c4:201:d660:6c0b:8a4f:4c77]) by smtp.gmail.com with ESMTPSA id k186sm8481087pge.13.2019.01.16.15.05.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 15:05:56 -0800 (PST) From: Yuchung Cheng To: davem@davemloft.net, edumazet@google.com Cc: netdev@vger.kernel.org, ncardwell@google.com, soheil@google.com, Yuchung Cheng Subject: [PATCH net-next 5/8] tcp: create a helper to model exponential backoff Date: Wed, 16 Jan 2019 15:05:32 -0800 Message-Id: <20190116230535.162758-6-ycheng@google.com> X-Mailer: git-send-email 2.20.1.97.g81188d93c3-goog In-Reply-To: <20190116230535.162758-1-ycheng@google.com> References: <20190116230535.162758-1-ycheng@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 Create a helper to model TCP exponential backoff for the next patch. This is pure refactor w no behavior change. Signed-off-by: Yuchung Cheng Signed-off-by: Eric Dumazet Reviewed-by: Neal Cardwell Reviewed-by: Soheil Hassas Yeganeh --- net/ipv4/tcp_timer.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index 074de38bafbd..bcc2f5783e57 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -159,7 +159,20 @@ static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk) tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); } - +static unsigned int tcp_model_timeout(struct sock *sk, + unsigned int boundary, + unsigned int rto_base) +{ + unsigned int linear_backoff_thresh, timeout; + + linear_backoff_thresh = ilog2(TCP_RTO_MAX / rto_base); + if (boundary <= linear_backoff_thresh) + timeout = ((2 << boundary) - 1) * rto_base; + else + timeout = ((2 << linear_backoff_thresh) - 1) * rto_base + + (boundary - linear_backoff_thresh) * TCP_RTO_MAX; + return jiffies_to_msecs(timeout); +} /** * retransmits_timed_out() - returns true if this connection has timed out * @sk: The current socket @@ -177,23 +190,15 @@ static bool retransmits_timed_out(struct sock *sk, unsigned int boundary, unsigned int timeout) { - const unsigned int rto_base = TCP_RTO_MIN; - unsigned int linear_backoff_thresh, start_ts; + unsigned int start_ts; if (!inet_csk(sk)->icsk_retransmits) return false; start_ts = tcp_sk(sk)->retrans_stamp; - if (likely(timeout == 0)) { - linear_backoff_thresh = ilog2(TCP_RTO_MAX/rto_base); - - if (boundary <= linear_backoff_thresh) - timeout = ((2 << boundary) - 1) * rto_base; - else - timeout = ((2 << linear_backoff_thresh) - 1) * rto_base + - (boundary - linear_backoff_thresh) * TCP_RTO_MAX; - timeout = jiffies_to_msecs(timeout); - } + if (likely(timeout == 0)) + timeout = tcp_model_timeout(sk, boundary, TCP_RTO_MIN); + return (s32)(tcp_time_stamp(tcp_sk(sk)) - start_ts - timeout) >= 0; } -- 2.20.1.97.g81188d93c3-goog