OSDN Git Service

tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample
authorNeal Cardwell <ncardwell@google.com>
Tue, 10 Apr 2012 07:59:20 +0000 (07:59 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Apr 2012 16:51:19 +0000 (09:51 -0700)
commit4a1abcbd24d856fe49029c3dc6f7fe8dc66ddaac
tree12b1633d5ff3cbcf76e3e4d89202250823406abe
parent6d7946bd33e29b2659504ffb3b98aa9fdb2229d8
tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample

[ Upstream commit 18a223e0b9ec8979320ba364b47c9772391d6d05 ]

Fix a code path in tcp_rcv_rtt_update() that was comparing scaled and
unscaled RTT samples.

The intent in the code was to only use the 'm' measurement if it was a
new minimum.  However, since 'm' had not yet been shifted left 3 bits
but 'new_sample' had, this comparison would nearly always succeed,
leading us to erroneously set our receive-side RTT estimate to the 'm'
sample when that sample could be nearly 8x too high to use.

The overall effect is to often cause the receive-side RTT estimate to
be significantly too large (up to 40% too large for brief periods in
my tests).

Signed-off-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/tcp_input.c