From: Lachlan Andrew <lachlan.andrew@gmail.com>
There is an overflow bug in net/ipv4/tcp_vegas.c for large BDPs
(e.g. 400Mbit/s, 400ms). The multiplication (old_wnd *
vegas->baseRTT) << V_PARAM_SHIFT overflows a u32.
[ Fix tcp_veno.c too, it has similar calculations. -DaveM ]
Signed-off-by: David S. Miller <davem@davemloft.net>
*/
tcp_reno_cong_avoid(sk, ack, in_flight);
} else {
*/
tcp_reno_cong_avoid(sk, ack, in_flight);
} else {
- u32 rtt, target_cwnd, diff;
+ u32 rtt, diff;
+ u64 target_cwnd;
/* We have enough RTT samples, so, using the Vegas
* algorithm, we determine if we should increase or
/* We have enough RTT samples, so, using the Vegas
* algorithm, we determine if we should increase or
* We keep it as a fixed point number with
* V_PARAM_SHIFT bits to the right of the binary point.
*/
* We keep it as a fixed point number with
* V_PARAM_SHIFT bits to the right of the binary point.
*/
- target_cwnd = ((old_wnd * vegas->baseRTT)
- << V_PARAM_SHIFT) / rtt;
+ target_cwnd = ((u64)old_wnd * vegas->baseRTT);
+ target_cwnd <<= V_PARAM_SHIFT;
+ do_div(target_cwnd, rtt);
/* Calculate the difference between the window we had,
* and the window we would like to have. This quantity
/* Calculate the difference between the window we had,
* and the window we would like to have. This quantity
* utilization.
*/
tp->snd_cwnd = min(tp->snd_cwnd,
* utilization.
*/
tp->snd_cwnd = min(tp->snd_cwnd,
V_PARAM_SHIFT)+1);
} else if (tp->snd_cwnd <= tp->snd_ssthresh) {
V_PARAM_SHIFT)+1);
} else if (tp->snd_cwnd <= tp->snd_ssthresh) {
*/
tcp_reno_cong_avoid(sk, ack, in_flight);
} else {
*/
tcp_reno_cong_avoid(sk, ack, in_flight);
} else {
+ u64 target_cwnd;
+ u32 rtt;
/* We have enough rtt samples, so, using the Veno
* algorithm, we determine the state of the network.
/* We have enough rtt samples, so, using the Veno
* algorithm, we determine the state of the network.
- target_cwnd = ((tp->snd_cwnd * veno->basertt)
- << V_PARAM_SHIFT) / rtt;
+ target_cwnd = (tp->snd_cwnd * veno->basertt);
+ target_cwnd <<= V_PARAM_SHIFT;
+ do_div(target_cwnd, rtt);
veno->diff = (tp->snd_cwnd << V_PARAM_SHIFT) - target_cwnd;
veno->diff = (tp->snd_cwnd << V_PARAM_SHIFT) - target_cwnd;