tcp: fix cwnd undo in Reno and HTCP congestion controls
Using ssthresh to revert cwnd is less reliable when ssthresh is bounded to 2 packets. This patch uses an existing variable in TCP "prior_cwnd" that snapshots the cwnd right before entering fast recovery and RTO recovery in Reno. This fixes the issue discussed in netdev thread: "A buggy behavior for Linux TCP Reno and HTCP" https://www.spinics.net/lists/netdev/msg444955.html Suggested-by: Neal Cardwell <ncardwell@google.com> Reported-by: Wei Sun <unlcsewsun@gmail.com> Signed-off-by: Yuchung Cheng <ncardwell@google.com> Signed-off-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
10377ba767
commit
4faf783998
@@ -66,7 +66,6 @@ static inline void htcp_reset(struct htcp *ca)
|
||||
|
||||
static u32 htcp_cwnd_undo(struct sock *sk)
|
||||
{
|
||||
const struct tcp_sock *tp = tcp_sk(sk);
|
||||
struct htcp *ca = inet_csk_ca(sk);
|
||||
|
||||
if (ca->undo_last_cong) {
|
||||
@@ -76,7 +75,7 @@ static u32 htcp_cwnd_undo(struct sock *sk)
|
||||
ca->undo_last_cong = 0;
|
||||
}
|
||||
|
||||
return max(tp->snd_cwnd, (tp->snd_ssthresh << 7) / ca->beta);
|
||||
return tcp_reno_undo_cwnd(sk);
|
||||
}
|
||||
|
||||
static inline void measure_rtt(struct sock *sk, u32 srtt)
|
||||
|
Reference in New Issue
Block a user