From owner-dev-commits-src-all@freebsd.org Thu Mar 4 08:27:58 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A735E566659; Thu, 4 Mar 2021 08:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrkWy4Ksdz4pfZ; Thu, 4 Mar 2021 08:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87CE819E53; Thu, 4 Mar 2021 08:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1248RwNu013528; Thu, 4 Mar 2021 08:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1248Rw69013527; Thu, 4 Mar 2021 08:27:58 GMT (envelope-from git) Date: Thu, 4 Mar 2021 08:27:58 GMT Message-Id: <202103040827.1248Rw69013527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 05e742af6f54 - stable/13 - calculate prr_out correctly when pipe < ssthresh MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05e742af6f548364909ed671f0b3774e54dc77d1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 08:27:58 -0000 The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=05e742af6f548364909ed671f0b3774e54dc77d1 commit 05e742af6f548364909ed671f0b3774e54dc77d1 Author: Richard Scheffenegger AuthorDate: 2021-03-01 15:25:46 +0000 Commit: Richard Scheffenegger CommitDate: 2021-03-04 08:13:51 +0000 calculate prr_out correctly when pipe < ssthresh Reviewed By: #transport, tuexen MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D28998 (cherry picked from commit 0b0f8b359d0b94b09cfec35e5d5de01b23c7fbf1) --- sys/netinet/tcp_input.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index f7ef3ed81da2..0cb99ce8f2c5 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2606,10 +2606,12 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, } else { if (V_tcp_do_prr_conservative) limit = tp->sackhint.prr_delivered - - tp->sackhint.sack_bytes_rexmit; + (tp->sackhint.sack_bytes_rexmit + + (tp->snd_nxt - tp->snd_recover)); else limit = imax(tp->sackhint.prr_delivered - - tp->sackhint.sack_bytes_rexmit, + (tp->sackhint.sack_bytes_rexmit + + (tp->snd_nxt - tp->snd_recover)), del_data) + maxseg; snd_cnt = imin(tp->snd_ssthresh - pipe, limit); } @@ -3982,10 +3984,12 @@ tcp_prr_partialack(struct tcpcb *tp, struct tcphdr *th) } else { if (V_tcp_do_prr_conservative) limit = tp->sackhint.prr_delivered - - tp->sackhint.sack_bytes_rexmit; + (tp->sackhint.sack_bytes_rexmit + + (tp->snd_nxt - tp->snd_recover)); else limit = imax(tp->sackhint.prr_delivered - - tp->sackhint.sack_bytes_rexmit, + (tp->sackhint.sack_bytes_rexmit + + (tp->snd_nxt - tp->snd_recover)), del_data) + maxseg; snd_cnt = imin((tp->snd_ssthresh - pipe), limit); }