tcp: cubic scaling error
Subsystems (3)
PATCH 1/1 tcp: cubic scaling error
Doug Leith observed a discrepancy between the version of CUBIC described in the papers and the version in 2.6.18. A math error related to scaling causes Cubic to grow too slowly.
Patch is from "Sangtae Ha" <[email protected]>. I validated that it does fix the problems.
See the following to show behavior over 500ms 100 Mbit link.
Sender (2.6.19-rc3) --- Bridge (2.6.18-rt7) ------- Receiver (2.6.19-rc3)
1G [netem] 100M http://developer.osdl.org/shemminger/tcp/2.6.19-rc3/cubic-orig.png http://developer.osdl.org/shemminger/tcp/2.6.19-rc3/cubic-fix.png
net/ipv4/tcp_cubic.c +3 -3
@@ -190,7 +190,7 @@*/ /* change the unit from HZ to bictcp_HZ */ - t = ((tcp_time_stamp + ca->delay_min - ca->epoch_start) + t = ((tcp_time_stamp + (ca->delay_min>>3 ) - ca->epoch_start) <<BICTCP_HZ ) /HZ ;if (t < ca->bic_K)/* t - K */
@@ -259,7 +259,7 @@ (s32)(tcp_time_stamp - ca->epoch_start) < HZ)return ; - delay = tcp_time_stamp - tp->rx_opt.rcv_tsecr; + delay = (tcp_time_stamp - tp->rx_opt.rcv_tsecr)<<3 ;if (delay ==0 ) delay =1 ;
@@ -366,7 +366,7 @@ beta_scale =8 *(BICTCP_BETA_SCALE +beta)/3 / (BICTCP_BETA_SCALE - beta); - cube_rtt_scale = (bic_scale <<3 ) /10 ;/* 1024*c/rtt */ + cube_rtt_scale = (bic_scale *10 );/* 1024*c/rtt */ /* calculate the "K" for (wmax-cwnd) = c/rtt * K^3 * so K = cubic_root( (wmax-cwnd)*rtt/c )
From: Stephen Hemminger <[email protected]>
Date: Wed, 25 Oct 2006 10:52:29 -0700
Quoted 9 lines
Doug Leith observed a discrepancy between the version of CUBIC described in the papers and the version in 2.6.18. A math error related to scaling causes Cubic to grow too slowly.
Patch is from "Sangtae Ha" <[email protected]>. I validated that it does fix the problems.
See the following to show behavior over 500ms 100 Mbit link.
Quoted 7 lines
Sender (2.6.19-rc3) --- Bridge (2.6.18-rt7) ------- Receiver (2.6.19-rc3)
1G [netem] 100M http://developer.osdl.org/shemminger/tcp/2.6.19-rc3/cubic-orig.png http://developer.osdl.org/shemminger/tcp/2.6.19-rc3/cubic-fix.pngSigned-off-by Stephen Hemminger <[email protected]>
Applied, thanks a lot Stephen.