git: 2b43cd2ea26f - stable/13 - Improve PRR initial transmission timing
Richard Scheffenegger
rscheff at FreeBSD.org
Wed Mar 3 07:57:00 UTC 2021
The branch stable/13 has been updated by rscheff:
URL: https://cgit.FreeBSD.org/src/commit/?id=2b43cd2ea26f758d23e8c009cf7521c4ddec7353
commit 2b43cd2ea26f758d23e8c009cf7521c4ddec7353
Author: Richard Scheffenegger <rscheff at FreeBSD.org>
AuthorDate: 2021-02-28 14:46:38 +0000
Commit: Richard Scheffenegger <rscheff at FreeBSD.org>
CommitDate: 2021-03-03 07:12:49 +0000
Improve PRR initial transmission timing
Reviewed By: tuexen, #transport
MFC after: 3 days
Sponsored by: NetApp, Inc.
Differential Revision: https://reviews.freebsd.org/D28953
(cherry picked from commit e9071000c9a04e3f685579500e24da9848944bb1)
---
sys/netinet/tcp_input.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 1a4a4619c4bf..f7ef3ed81da2 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2595,7 +2595,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
pipe = (tp->snd_nxt - tp->snd_fack) +
tp->sackhint.sack_bytes_rexmit;
tp->sackhint.prr_delivered += del_data;
- if (pipe > tp->snd_ssthresh) {
+ if (pipe >= tp->snd_ssthresh) {
if (tp->sackhint.recover_fs == 0)
tp->sackhint.recover_fs =
imax(1, tp->snd_nxt - tp->snd_una);
@@ -2695,7 +2695,8 @@ enter_recovery:
* snd_ssthresh is already updated by
* cc_cong_signal.
*/
- tp->sackhint.prr_delivered = 0;
+ tp->sackhint.prr_delivered =
+ tp->sackhint.sacked_bytes;
tp->sackhint.sack_bytes_rexmit = 0;
tp->sackhint.recover_fs = max(1,
tp->snd_nxt - tp->snd_una);
@@ -3970,7 +3971,7 @@ tcp_prr_partialack(struct tcpcb *tp, struct tcphdr *th)
/*
* Proportional Rate Reduction
*/
- if (pipe > tp->snd_ssthresh) {
+ if (pipe >= tp->snd_ssthresh) {
if (tp->sackhint.recover_fs == 0)
tp->sackhint.recover_fs =
imax(1, tp->snd_nxt - tp->snd_una);
More information about the dev-commits-src-all
mailing list