From nobody Thu Dec 14 11:05:19 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SrTz33F75z53prq; Thu, 14 Dec 2023 11:05:19 +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 4SrTz32q3Yz4TCV; Thu, 14 Dec 2023 11:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702551919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9xuGeagLnBESg+jDIy9vJDAQJwiQLMo0IGfxz95FLA=; b=B9verkWg7iEhIBIAfsy8cJkbXNM/hx9CC7cAGQ8sNVlG/bqFUfA+0BsSVUzqpQcCQmMBwK YU2Wad90YWJdsLqrkkTfZCqSnz+b6OeyAfew/uarjCkuEeA/GqkHMgt4gpTJBOshIlhUBM AMnN1tBhYtL/VElMgTNjoY1TFl6fEGlMCc94W++4bMdXnHIXU1Zqivmn/tEBc1J9Yz3bJ5 tmBqskLvw3HpVT8hADkd/PEDS6nkMQne77PAqzRSRnbKXdzHk+/9MjDtgto49sSQll1kQq YFNF1ELBfDq2QMdyl+1w3XTWE56J0K2dCIWv7BUSKjnH50gZlbJrXWqkWB7jUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702551919; a=rsa-sha256; cv=none; b=LFzM3fkzhbHGn48hcr/I9p1W/5Vob2PVExOvHdh0F9H0LeUwATb3DgAj1sPkAPTCcLvDnQ UvGTb2r4z8ev7GJBZvMBAyG6H1lO4k0pcKA6d2Lu0OD7FSQmRBINdz9B9/xcqBpSc5+JMf 4Bc82lF3a2sa8ax/6cacNQIA2rzxEc03JaC7NLp0EXzFuA/5bAHCugsRfsVokF7x/L2XY/ rwGWBApqxy+fumN37Kr7BHml4gCHlL0khf3LN1bDMJOXM4Chrs/GJf9+TveYR/b0yO8Ss8 veBestljy/nckSA+/aQ3XLi6qriCBvGp6sktGjzvNx8owmFjSmDOaoIah3dWLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702551919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9xuGeagLnBESg+jDIy9vJDAQJwiQLMo0IGfxz95FLA=; b=lFvtkZIHNGhyKrysj/uAqrq2nboQrU3atfSd+ujuWAEPzzFk6xP+tJUZmgWTQdwcb3ej95 KClUG/bdNkwYT3WlmvLiMHoEr+2JPoXg4VxqSEUaM81b4vonatziG1Jw9VOGZW/VlCWJy9 +le1WAiiBJqo7sHZKlWjW3+nbzTcxebdCSPRp/oMpuvPIL1XMthM7ZxcDAZz6wHI+48Ntp gf/RQ5ruSqaCduR57QJw2oYtfqPBvvFohak7XuJ0nwJnCIyH9hzdsdijCVamAt/4U2sRFW 7F7hIBT/UL41BuTHUTfkMO7q9U9QNijUHLxRd5OqXWfy7tMxccjKQEABw/UbJQ== 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 4SrTz31mFyz994; Thu, 14 Dec 2023 11:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BEB5JnL010709; Thu, 14 Dec 2023 11:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEB5Jgs010706; Thu, 14 Dec 2023 11:05:19 GMT (envelope-from git) Date: Thu, 14 Dec 2023 11:05:19 GMT Message-Id: <202312141105.3BEB5Jgs010706@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: 35707083c6fb - stable/14 - tcp: shift PRR sending cadence slightly left List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org 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/14 X-Git-Reftype: branch X-Git-Commit: 35707083c6fb47d28aea5e421ea99b3f0daea0a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=35707083c6fb47d28aea5e421ea99b3f0daea0a6 commit 35707083c6fb47d28aea5e421ea99b3f0daea0a6 Author: Richard Scheffenegger AuthorDate: 2023-12-07 14:13:05 +0000 Commit: Richard Scheffenegger CommitDate: 2023-12-14 10:13:09 +0000 tcp: shift PRR sending cadence slightly left Don't let PRR pass up on the opportunity of clocking out packets on arrival of ACKs - by pulling sends forward by about half a packet. Prevents unexpectedly long runs of incoming ACKs without eliciting a packet transmission. MFC after: 1 week Reviewed By: #transport, tuexen Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42918 (cherry picked from commit 9276ad23b872eddc42e05304acb10bf5421b043c) --- sys/netinet/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 11ec7d2d74d2..15b7311f4605 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -3972,7 +3972,7 @@ tcp_do_prr_ack(struct tcpcb *tp, struct tcphdr *th, struct tcpopt *to) imax(1, tp->snd_nxt - tp->snd_una); snd_cnt = howmany((long)tp->sackhint.prr_delivered * tp->snd_ssthresh, tp->sackhint.recover_fs) - - tp->sackhint.prr_out; + tp->sackhint.prr_out + maxseg - 1; } else { if (V_tcp_do_prr_conservative || (del_data == 0)) limit = tp->sackhint.prr_delivered -