netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Dumazet <eric.dumazet@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: netdev <netdev@vger.kernel.org>,
	Alexander Duyck <alexanderduyck@fb.com>,
	Coco Li <lixiaoyan@google.com>,
	Eric Dumazet <edumazet@google.com>,
	Eric Dumazet <eric.dumazet@gmail.com>
Subject: [PATCH v6 net-next 04/13] tcp_cubic: make hystart_ack_delay() aware of BIG TCP
Date: Mon,  9 May 2022 20:32:10 -0700	[thread overview]
Message-ID: <20220510033219.2639364-5-eric.dumazet@gmail.com> (raw)
In-Reply-To: <20220510033219.2639364-1-eric.dumazet@gmail.com>

From: Eric Dumazet <edumazet@google.com>

hystart_ack_delay() had the assumption that a TSO packet
would not be bigger than GSO_MAX_SIZE.

This will no longer be true.

We should use sk->sk_gso_max_size instead.

This reduces chances of spurious Hystart ACK train detections.

Signed-off-by: Eric Dumazet <edumazet@google.com>
---
 net/ipv4/tcp_cubic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ipv4/tcp_cubic.c b/net/ipv4/tcp_cubic.c
index b0918839bee7cf0264ec3bbcdfc1417daa86d197..68178e7280ce24c26a48e48a51518d759e4d1718 100644
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
@@ -372,7 +372,7 @@ static void cubictcp_state(struct sock *sk, u8 new_state)
  * We apply another 100% factor because @rate is doubled at this point.
  * We cap the cushion to 1ms.
  */
-static u32 hystart_ack_delay(struct sock *sk)
+static u32 hystart_ack_delay(const struct sock *sk)
 {
 	unsigned long rate;
 
@@ -380,7 +380,7 @@ static u32 hystart_ack_delay(struct sock *sk)
 	if (!rate)
 		return 0;
 	return min_t(u64, USEC_PER_MSEC,
-		     div64_ul((u64)GSO_MAX_SIZE * 4 * USEC_PER_SEC, rate));
+		     div64_ul((u64)sk->sk_gso_max_size * 4 * USEC_PER_SEC, rate));
 }
 
 static void hystart_update(struct sock *sk, u32 delay)
-- 
2.36.0.512.ge40c2bad7a-goog


  parent reply	other threads:[~2022-05-10  3:32 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-10  3:32 [PATCH v6 net-next 00/13] tcp: BIG TCP implementation Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 01/13] net: add IFLA_TSO_{MAX_SIZE|SEGS} attributes Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 02/13] net: allow gso_max_size to exceed 65536 Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 03/13] net: limit GSO_MAX_SIZE to 524280 bytes Eric Dumazet
2022-05-10  3:32 ` Eric Dumazet [this message]
2022-05-10  3:32 ` [PATCH v6 net-next 05/13] ipv6: add struct hop_jumbo_hdr definition Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 06/13] ipv6/gso: remove temporary HBH/jumbo header Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 07/13] ipv6/gro: insert " Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 08/13] net: allow gro_max_size to exceed 65536 Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 09/13] ipv6: Add hop-by-hop header to jumbograms in ip6_output Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 10/13] net: loopback: enable BIG TCP packets Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 11/13] veth: " Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 12/13] mlx4: support " Eric Dumazet
2022-05-10  3:32 ` [PATCH v6 net-next 13/13] mlx5: " Eric Dumazet
2022-05-12  8:40   ` Saeed Mahameed
2022-05-12  9:02     ` Paolo Abeni
2022-05-13  4:29       ` Saeed Mahameed
2022-05-13  4:34         ` Eric Dumazet
2022-05-13  5:49           ` Saeed Mahameed
2022-05-13 13:05             ` Eric Dumazet
2022-05-13 17:04               ` Jakub Kicinski
2022-05-13 17:12                 ` Eric Dumazet
2022-05-10 19:49 ` [PATCH v6 net-next 00/13] tcp: BIG TCP implementation Alexander H Duyck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220510033219.2639364-5-eric.dumazet@gmail.com \
    --to=eric.dumazet@gmail.com \
    --cc=alexanderduyck@fb.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=lixiaoyan@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).