From nobody Thu Feb 8 19:41:25 2024 X-Original-To: dev-commits-src-main@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 4TW6mj4V7Hz5BGrK; Thu, 8 Feb 2024 19:41:25 +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 4TW6mj43WQz4qqx; Thu, 8 Feb 2024 19:41:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707421285; 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=GBH8t8t7+wjLP9XEZTgiOhxk1bm2dNfpDJaZ0rlNVKk=; b=KZbCTrUKHfYb0qz0gkZhT3ko2KuZPsD5WzA98OoLFN1o5jj7g99+HwPy0/dTiW/6FoEHbH IQ/PSmALvThhAyCids0s4EMxRkma0SaCpfhGDTtprfqcgnJdODsOkEo5TC6xyVKNtD3J2q o3V5khnrMybcd5Jp+e7Yjs066pU8L1UlJpCxi93kcV7aTwZXLheKLFdGPdmsuIoqwOXIt3 aJBudD7UKH/CsZ7Q4mko/4LHN4wbs19mjeG0eDdkoz7pOmsMF99OFpTvTnvrwlyd38smsh mNWnjbJsR5/JlfMl97E2EsOVeTlAgYmC+OerqAN4dN7G1DGAmJvG8BI9TTqVdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707421285; 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=GBH8t8t7+wjLP9XEZTgiOhxk1bm2dNfpDJaZ0rlNVKk=; b=VhGOzLy6rjPVumvaTaoOOUyVtCDGb09NQnq3rhCbdGSQSSuclP1GH1l2X84+oBXbVK74MH QK8D0XnqXZH1QWzJBxArddh2o8NL0oK2qwImS2jAU0VtUTVqf+oNNko3iHKM77gBeLFlIy fnWC88FUdyaUQuo8iMH4pZl9E19CflX4nOszsFNEhgEXAS81v6DedzySgFTBIkmOvJA+nN IAIK+jQT9OEERkdHa3M6XFMwQWTn3zBta3fxhUKB8gC/+pRwNYBdO0g4NtNQ60uMoHzmM2 sOaqi1PEceysNvJGwwesmm9/sdQ9kOwuqKTuwhYlZzGUTUPvkTFATlBxYS5Tbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707421285; a=rsa-sha256; cv=none; b=ywfrB8WyU8tva7ReUiRddApNr4HgEeoxdgRLTnLQCnYkh1o9Rn6vyfTgqDSWROqxiR+ig1 XozjKqjZ/xIYmYm6vQNG5X3y8XbaM/kZvMthuc5K/N7jTySkRIktdxv2PtWdSWm6sbnuXd W3LarbV+HNdT+A3vVcs+5u6/ZV4gNgyynH8wkLfURnUi/4Hgqy1K245ekU2CY8GNwiP5cL aQjY+9DVP/Tmn+lXOr4VAg1NyPxqdatjmLuTxJiOaOyW0gegk11zLtnpD9C2TXVg9p8KX0 T4AAUSRYsAjLuaEmsD9YNt3SKIlwEnJGIdwL4Y5t1+i7bXb1b5K4+fPrgvUUNA== 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 4TW6mj37bTz12xp; Thu, 8 Feb 2024 19:41:25 +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 418JfPrG036904; Thu, 8 Feb 2024 19:41:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 418JfPkt036901; Thu, 8 Feb 2024 19:41:25 GMT (envelope-from git) Date: Thu, 8 Feb 2024 19:41:25 GMT Message-Id: <202402081941.418JfPkt036901@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: 23c4f232478a - main - tcp: ensure tcp_sack_partialack does not inflate cwnd after RTO List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 23c4f232478aa022cad45f2cde349ff56bb2a094 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=23c4f232478aa022cad45f2cde349ff56bb2a094 commit 23c4f232478aa022cad45f2cde349ff56bb2a094 Author: Richard Scheffenegger AuthorDate: 2024-02-08 18:56:27 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-08 19:40:25 +0000 tcp: ensure tcp_sack_partialack does not inflate cwnd after RTO The implicit assumption of snd_nxt always being larger than snd_recover is not true after RTO. In that case, cwnd would get inflated to ssthresh, which may be much larger than the current pipe (data in flight). Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43653 --- sys/netinet/tcp_sack.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c index 0c557dc4579d..f59cc5fe0d0b 100644 --- a/sys/netinet/tcp_sack.c +++ b/sys/netinet/tcp_sack.c @@ -953,8 +953,17 @@ tcp_sack_partialack(struct tcpcb *tp, struct tcphdr *th, u_int *maxsegp) /* Send one or 2 segments based on how much new data was acked. */ if ((BYTES_THIS_ACK(tp, th) / maxseg) >= 2) num_segs = 2; - tp->snd_cwnd = (tp->sackhint.sack_bytes_rexmit + - (tp->snd_nxt - tp->snd_recover) + num_segs * maxseg); + if (V_tcp_do_newsack) { + tp->snd_cwnd = imax(tp->snd_nxt - th->th_ack + + tp->sackhint.sack_bytes_rexmit - + tp->sackhint.sacked_bytes - + tp->sackhint.lost_bytes, maxseg) + + num_segs * maxseg; + } else { + tp->snd_cwnd = (tp->sackhint.sack_bytes_rexmit + + imax(0, tp->snd_nxt - tp->snd_recover) + + num_segs * maxseg); + } if (tp->snd_cwnd > tp->snd_ssthresh) tp->snd_cwnd = tp->snd_ssthresh; tp->t_flags |= TF_ACKNOW;