From ca04f5d4bb79ef22b708ebb8ab147fc5abb25300 Mon Sep 17 00:00:00 2001 From: Pengcheng Yang Date: Mon, 16 Mar 2020 14:35:10 +0800 Subject: tcp: fix stretch ACK bugs in Veno Change Veno to properly handle stretch ACKs in additive increase mode by passing in the count of ACKed packets to tcp_cong_avoid_ai(). Signed-off-by: Pengcheng Yang Acked-by: Neal Cardwell Signed-off-by: David S. Miller --- net/ipv4/tcp_veno.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'net/ipv4') diff --git a/net/ipv4/tcp_veno.c b/net/ipv4/tcp_veno.c index 857491c5b856..50a9a6e2c4cd 100644 --- a/net/ipv4/tcp_veno.c +++ b/net/ipv4/tcp_veno.c @@ -154,8 +154,9 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 acked) if (tcp_in_slow_start(tp)) { /* Slow start. */ - tcp_slow_start(tp, acked); - goto done; + acked = tcp_slow_start(tp, acked); + if (!acked) + goto done; } /* Congestion avoidance. */ @@ -163,7 +164,7 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 acked) /* In the "non-congestive state", increase cwnd * every rtt. */ - tcp_cong_avoid_ai(tp, tp->snd_cwnd, 1); + tcp_cong_avoid_ai(tp, tp->snd_cwnd, acked); } else { /* In the "congestive state", increase cwnd * every other rtt. @@ -177,7 +178,7 @@ static void tcp_veno_cong_avoid(struct sock *sk, u32 ack, u32 acked) veno->inc = 1; tp->snd_cwnd_cnt = 0; } else - tp->snd_cwnd_cnt++; + tp->snd_cwnd_cnt += acked; } done: if (tp->snd_cwnd < 2) -- cgit v1.2.3