Skip to contentSkip to conversation

tcp_bbr: improve arithmetic division in bbr_update_bw()

PATCH Applied Wen Yang 3 participants 3 messages Jan 20, 2020 – Jan 21, 2020

Subsystems (3)
lore
Share & tools
lore

Wen Yang

author
#0 lore raw

PATCH 1/1 tcp_bbr: improve arithmetic division in bbr_update_bw()

do_div() does a 64-by-32 division. Use div64_long() instead of it if the divisor is long, to avoid truncation to 32-bit. And as a nice side effect also cleans up the function a bit.

Cc Eric Dumazet <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Alexey Kuznetsov <[email protected]>
Cc Hideaki YOSHIFUJI <[email protected]>
---
 net/ipv4/tcp_bbr.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
net/ipv4/tcp_bbr.c +1 -2
index a6545ef0d27b..6c4d79baff26 100644
@@ -779,8 +779,7 @@ static void bbr_update_bw(struct sock *sk, const struct rate_sample *rs)
 	 * bandwidth sample. Delivered is in packets and interval_us in uS and
 	 * ratio will be <<1 for most connections. So delivered is first scaled.
 	 */
-	bw = (u64)rs->delivered * BW_UNIT;
-	do_div(bw, rs->interval_us);
+	bw = div64_long((u64)rs->delivered * BW_UNIT, rs->interval_us);
 
 	/* If this sample is application-limited, it is likely to have a very
 	 * low delivered count that represents application behavior rather than
Signature · 1 line
2.23.0
#1 lore raw
Quoted 4 lines · Wen Yang

do_div() does a 64-by-32 division. Use div64_long() instead of it if the divisor is long, to avoid truncation to 32-bit. And as a nice side effect also cleans up the function a bit.

Thanks !