From 8dab367e68b98c43771b725f13ce0f01a03b0de6 Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Tue, 17 May 2022 10:10:40 +0300 Subject: [PATCH] net-tcp_bbr: v2: Use correct 64-bit division Signed-off-by: Konstantin Demin Signed-off-by: Alexandre Frade --- net/ipv4/tcp_bbr.c | 2 +- net/ipv4/tcp_bbr2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c index 566995eaefd0c..8ab6e8f713f87 100644 --- a/net/ipv4/tcp_bbr.c +++ b/net/ipv4/tcp_bbr.c @@ -312,7 +312,7 @@ static u32 bbr_tso_segs_generic(struct sock *sk, unsigned int mss_now, bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift; bytes = min_t(u32, bytes, gso_max_size - 1 - MAX_TCP_HEADER); - segs = max_t(u32, bytes / mss_now, bbr_min_tso_segs(sk)); + segs = max_t(u32, div_u64(bytes, mss_now), bbr_min_tso_segs(sk)); return segs; } diff --git a/net/ipv4/tcp_bbr2.c b/net/ipv4/tcp_bbr2.c index fa49e17c47ca9..488429f0f3d0a 100644 --- a/net/ipv4/tcp_bbr2.c +++ b/net/ipv4/tcp_bbr2.c @@ -588,7 +588,7 @@ static void bbr_debug(struct sock *sk, u32 acked, bbr_rate_kbps(sk, bbr_max_bw(sk)), /* bw: max bw */ 0ULL, /* lb: [obsolete] */ 0ULL, /* ib: [obsolete] */ - (u64)sk->sk_pacing_rate * 8 / 1000, + div_u64((u64)sk->sk_pacing_rate * 8, 1000), acked, tcp_packets_in_flight(tp), rs->is_ack_delayed ? 'd' : '.', @@ -698,7 +698,7 @@ static u32 bbr_tso_segs_generic(struct sock *sk, unsigned int mss_now, } bytes = min_t(u32, bytes, gso_max_size - 1 - MAX_TCP_HEADER); - segs = max_t(u32, bytes / mss_now, bbr_min_tso_segs(sk)); + segs = max_t(u32, div_u64(bytes, mss_now), bbr_min_tso_segs(sk)); return segs; }