The branch main has been updated by rscheff:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e9071000c9a04e3f685579500e24da9848944bb1
commit e9071000c9a04e3f685579500e24da9848944bb1
Author: Richard Scheffenegger <rsch...@freebsd.org>
AuthorDate: 2021-02-28 14:46:38 +0000
Commit: Richard Scheffenegger <rsch...@freebsd.org>
CommitDate: 2021-02-28 14:46:54 +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
---
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 7b0987eed358..d802bc8f47ae 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -2589,7 +2589,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);
@@ -2689,7 +2689,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);
@@ -3964,7 +3965,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);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
