From: Eric Dumazet <eric.dumazet@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
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 v4 net-next 03/14] tcp_cubic: make hystart_ack_delay() aware of BIG TCP
Date: Wed, 9 Mar 2022 21:46:52 -0800 [thread overview]
Message-ID: <20220310054703.849899-4-eric.dumazet@gmail.com> (raw)
In-Reply-To: <20220310054703.849899-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 24d562dd62254d6e50dd08236f8967400d81e1ea..dfc9dc951b7404776b2246c38273fbadf03c39fd 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.35.1.616.g0bdcbb4464-goog
next prev parent reply other threads:[~2022-03-10 5:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-10 5:46 [PATCH v4 net-next 00/14] tcp: BIG TCP implementation Eric Dumazet
2022-03-10 5:46 ` [PATCH v4 net-next 01/14] net: add netdev->tso_ipv6_max_size attribute Eric Dumazet
2022-03-10 5:46 ` [PATCH v4 net-next 02/14] ipv6: add dev->gso_ipv6_max_size Eric Dumazet
2022-03-11 16:21 ` Alexander H Duyck
2022-03-15 15:57 ` Eric Dumazet
2022-03-10 5:46 ` Eric Dumazet [this message]
2022-03-10 5:46 ` [PATCH v4 net-next 04/14] ipv6: add struct hop_jumbo_hdr definition Eric Dumazet
2022-03-10 5:46 ` [PATCH v4 net-next 05/14] ipv6/gso: remove temporary HBH/jumbo header Eric Dumazet
2022-03-10 5:46 ` [PATCH v4 net-next 06/14] ipv6/gro: insert " Eric Dumazet
2022-03-11 16:24 ` Alexander H Duyck
2022-03-15 16:01 ` Eric Dumazet
2022-03-15 16:04 ` Alexander Duyck
2022-03-15 16:10 ` Eric Dumazet
2022-03-15 17:35 ` Alexander Duyck
2022-03-10 5:46 ` [PATCH v4 net-next 07/14] ipv6: add GRO_IPV6_MAX_SIZE Eric Dumazet
2022-03-10 5:46 ` [PATCH v4 net-next 08/14] ipv6: Add hop-by-hop header to jumbograms in ip6_output Eric Dumazet
2022-03-10 5:46 ` [PATCH v4 net-next 09/14] net: loopback: enable BIG TCP packets Eric Dumazet
2022-03-10 5:46 ` [PATCH v4 net-next 10/14] bonding: update dev->tso_ipv6_max_size Eric Dumazet
2022-03-10 5:47 ` [PATCH v4 net-next 11/14] macvlan: enable BIG TCP Packets Eric Dumazet
2022-03-10 5:47 ` [PATCH v4 net-next 12/14] ipvlan: " Eric Dumazet
2022-03-10 5:47 ` [PATCH v4 net-next 13/14] mlx4: support BIG TCP packets Eric Dumazet
2022-03-10 5:47 ` [PATCH v4 net-next 14/14] mlx5: " Eric Dumazet
2022-03-11 17:13 ` [PATCH v4 net-next 00/14] tcp: BIG TCP implementation Alexander H Duyck
2022-03-15 15:50 ` Eric Dumazet
2022-03-15 16:17 ` Alexander Duyck
2022-03-15 16:33 ` Eric Dumazet
2022-03-15 17:20 ` Alexander 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=20220310054703.849899-4-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 \
/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).