From nobody Tue Mar 28 02:48:11 2023 X-Original-To: dev-commits-src-all@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 4PlvHw09cxz42Sdc; Tue, 28 Mar 2023 02:48:12 +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 4PlvHv6kvhz4NGk; Tue, 28 Mar 2023 02:48:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679971691; 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=NhgHSRohPj1ExcoC0nRSWTUIqn8xdBLhuIryUo3yuww=; b=Rb954e0OsmOz9ch1+DR/FwYrYDe9PidyRozA3rJzTNGiFxD9D0JX2nHFCaYVV+8AygJI4m DgFqWBZSynooDiMxndCkWCzm33lNwtjg4drGbTbdfjG1EJbhBG7JuxVEuVzxi1CI5Ut/Xi UXnJMF0lnbmXBnx/fHqB1pogY9phIB2w59Kf3S/C7KtfMfl6PT6fTobmYJNlfiCkSw+rwq zDJUCOvRM+DLQxALcdh9fgW4j5Ae0yWov3Nlkp9v6/FN7OFOAtQ4BIe3ySP/Pu1a0bkgEJ dg8WG8tmuNW53lR3QKnLIINit1ff/LoREL2NtZj1bOKcNJorSkH0rThrqZF79A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679971691; 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=NhgHSRohPj1ExcoC0nRSWTUIqn8xdBLhuIryUo3yuww=; b=bax+W21WvPrqoLjrfSJ2VvSz4GPFCB46r/YarpkDFYNN2rBaT4ArSyvQKpg4vgxVYozrA4 dRXSURAypZpW65zua/c0tY7z8de7C0AUHM1+nST+yisqg5Ur4sUrNV0ym5QsoTSDnSi3pq py+t9mY+DyTbJP/51IiYx4dC0BA7gxW//dCo10AU2K8fHCT1iAq2diYnCurMfvUriK6f7z 7fT/JQEMf6UDkNTlxlTk1T1OyzGgFaDZtlu779/n0uyuwznWOUy7Xq95NNUMwT1cwj31wF TB+IbzGCuiUrmXc/XnUozZ84eOvBGT58X2S/KlyOYsSPBokGw8p4gNHEr78UUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679971691; a=rsa-sha256; cv=none; b=YaQ3uaE0WLnEdqOGz0GqRspy+orp38gziDP/h69qiIKEep643eg+K05tM+jyyxUERxsWcT T8AE0rrqguzE5R2SY6MBNUAIBowWbOaj6IXt7uxU7TGWBtCZwCjdJBMJjQYqLSsUtv8nFR ACqplMe2fvTXM4VljrQE/M150SkXHMBbPS5aJClRoWqWb4hXWgBjK6V05QMLqSUYrDiX8f udKamOb+GXa1LpBtc33EBVIiKvTsa5qxSnPGRPrceuTn1mfVyozMIbOFbzsi9xwpRdfbAC +Ht+sCtUQ2CeaEcd/+d4qz/pPmWfYYygqNGD8pe5O4iIsRSA38AbS1kD9UNmBQ== 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 4PlvHv5n5VznH4; Tue, 28 Mar 2023 02:48:11 +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 32S2mBOd075687; Tue, 28 Mar 2023 02:48:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32S2mB2F075686; Tue, 28 Mar 2023 02:48:11 GMT (envelope-from git) Date: Tue, 28 Mar 2023 02:48:11 GMT Message-Id: <202303280248.32S2mB2F075686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: f858eb916fd2 - main - tcp: send SACK rescue retransmission also mid-stream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: f858eb916fd263f696c290798d4a260b6e55af60 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=f858eb916fd263f696c290798d4a260b6e55af60 commit f858eb916fd263f696c290798d4a260b6e55af60 Author: Richard Scheffenegger AuthorDate: 2023-03-28 02:01:48 +0000 Commit: Richard Scheffenegger CommitDate: 2023-03-28 02:47:01 +0000 tcp: send SACK rescue retransmission also mid-stream Previously, SACK rescue retransmissions would only happen on a loss recovery at the tail end of the send buffer. This extends the mechanism such that partial ACKs without SACK mid-stream also trigger a rescue retransmission to try avoid an otherwise unavoidable retransmission timeout. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D39274 --- sys/netinet/tcp_sack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 558773f91228..5900bc19e2e0 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -879,7 +879,6 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th) */ if ((V_tcp_do_newsack) && SEQ_LT(th->th_ack, tp->snd_recover) && - (tp->snd_recover == tp->snd_max) && TAILQ_EMPTY(&tp->snd_holes) && (tp->sackhint.delivered_data > 0)) { /* @@ -891,6 +890,7 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th) tcp_seq highdata = tp->snd_max; if (tp->t_flags & TF_SENTFIN) highdata--; + highdata = SEQ_MIN(highdata, tp->snd_recover); if (th->th_ack != highdata) { tp->snd_fack = th->th_ack; (void)tcp_sackhole_insert(tp, SEQ_MAX(th->th_ack,