git: 853fd7a2e398 - main - Ensure cwnd doesn't shrink to zero with PRR

[Richard Scheffenegger]

The branch main has been updated by rscheff:

URL: https://cgit.FreeBSD.org/src/commit/?id=853fd7a2e39802e46bd3d6476529796ac22412d9

commit 853fd7a2e39802e46bd3d6476529796ac22412d9
Author:     Richard Scheffenegger <rscheff at FreeBSD.org>
AuthorDate: 2021-02-19 12:52:06 +0000
Commit:     Richard Scheffenegger <rscheff at FreeBSD.org>
CommitDate: 2021-02-19 12:55:32 +0000

    Ensure cwnd doesn't shrink to zero with PRR
    
    Under some circumstances, PRR may end up with a fully
    collapsed cwnd when finalizing the loss recovery.
    
    Reviewed By:    #transport, kbowling
    Reported by:    Liang Tian
    MFC after:      1 week
    Sponsored by:   NetApp, Inc.
    Differential Revision:  https://reviews.freebsd.org/D28780
---
 sys/netinet/tcp_input.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index dbe86e4e65c0..39039fe5b9a3 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -3990,8 +3990,8 @@ tcp_prr_partialack(struct tcpcb *tp, struct tcphdr *th)
 	 * If there is going to be a SACK retransmission, adjust snd_cwnd
 	 * accordingly.
 	 */
-	tp->snd_cwnd = tp->snd_nxt - tp->snd_recover +
-		tp->sackhint.sack_bytes_rexmit + (snd_cnt * maxseg);
+	tp->snd_cwnd = max(maxseg, (int64_t)tp->snd_nxt - tp->snd_recover +
+		tp->sackhint.sack_bytes_rexmit + (snd_cnt * maxseg));
 	tp->t_flags |= TF_ACKNOW;
 	(void) tcp_output(tp);
 }