git: 32ed0ef06b83 - stable/13 - PRR: use accurate rfc6675_pipe when enabled

[Richard Scheffenegger]

The branch stable/13 has been updated by rscheff:

URL: https://cgit.FreeBSD.org/src/commit/?id=32ed0ef06b8326271c4665406cac81fa47d0d29c

commit 32ed0ef06b8326271c4665406cac81fa47d0d29c
Author:     Richard Scheffenegger <rscheff at FreeBSD.org>
AuthorDate: 2021-02-20 19:10:00 +0000
Commit:     Richard Scheffenegger <rscheff at FreeBSD.org>
CommitDate: 2021-02-28 07:35:37 +0000

    PRR: use accurate rfc6675_pipe when enabled
    
    Reviewed By: #transport, tuexen
    MFC after:   1 week
    Sponsored by:        NetApp, Inc.
    Differential Revision: https://reviews.freebsd.org/D28816
    
    (cherry picked from commit a8e431e1537d056a3f9e466eaceec28c399c220b)
---
 sys/netinet/tcp_input.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 08d000611407..aaa9465c00e9 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2586,8 +2586,11 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 						 * estimate to be in the network.
 						 */
 						del_data = tp->sackhint.delivered_data;
-						pipe = (tp->snd_nxt - tp->snd_fack) +
-							tp->sackhint.sack_bytes_rexmit;
+						if (V_tcp_do_rfc6675_pipe)
+							pipe = tcp_compute_pipe(tp);
+						else
+							pipe = (tp->snd_nxt - tp->snd_fack) +
+								tp->sackhint.sack_bytes_rexmit;
 						tp->sackhint.prr_delivered += del_data;
 						if (pipe > tp->snd_ssthresh) {
 							if (tp->sackhint.recover_fs == 0)
@@ -3942,7 +3945,10 @@ tcp_prr_partialack(struct tcpcb *tp, struct tcphdr *th)
 	if (SEQ_GEQ(th->th_ack, tp->snd_una))
 		del_data = BYTES_THIS_ACK(tp, th);
 	del_data += tp->sackhint.delivered_data;
-	pipe = (tp->snd_nxt - tp->snd_fack) + tp->sackhint.sack_bytes_rexmit;
+	if (V_tcp_do_rfc6675_pipe)
+		pipe = tcp_compute_pipe(tp);
+	else
+		pipe = (tp->snd_nxt - tp->snd_fack) + tp->sackhint.sack_bytes_rexmit;
 	tp->sackhint.prr_delivered += del_data;
 	/*
 	 * Proportional Rate Reduction