From nobody Mon Jan 08 18:39:58 2024 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 4T82t653vlz56P5D; Mon, 8 Jan 2024 18:39: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 4T82t62x3Kz49WY; Mon, 8 Jan 2024 18:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704739198; 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=Y37I0X1cAbCHc6K40IptlPxNInojeZ8kte9CdoAjloA=; b=FqHEy5Hl7hX9w9/TRFKEB+R45QoCo1hqOOZ7xKJMRgoxs+tpx8bHdZJQMqIJeQl6c4hEG4 Nt4ccxt1V7rBZ+F5YSfCvB9sEfvJq0pH9F7ghWRNogXjnoCSAOAa5noCQDKjPyi6uUCU3p +1ge1XEMxKW3qsdgLpGuOjgq5Rfvkc/kymjDiB73SeIQ//yypySRFYmvCtv9hKcNYG9N4d GWcn/wre6lp43VeWV6P4C6oyFaIqJpVKtcTKpPeQC7cxB1ioPuXUSYCjkODnjXTIoZXbzk BXoAGfMK5JBsxgDsjJ3jhgbc3sYBjlzKMa11wJxx8NdJdKwUbLJMwJvvHKFKfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704739198; 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=Y37I0X1cAbCHc6K40IptlPxNInojeZ8kte9CdoAjloA=; b=mG/xrisG0PX5IDJgKFwhDVNTGh9wQNWC9Lutf9b9I35dUvntBMO/Q3mt1UVO1RXE6uTjNr GPpqpbqSkTGOxyTVDBfSFzP+FUNwC9CC376DwEIXr1fsDSIWGNUmLdCEkuQFhyM+/H1B9A 2Hpfm1gmEm4an01DhAfpMFXuHxd+1DxOoluw2DiEQwBmhqarjfd0bz2B6H/AiFdEJ6VYWR 1Nj9AADUyqQWZ8MfkTxqguqjnof1Gx1Qz6OIFCqASNoNA1dLlMaW26dsXr9a3uzT+a3VWW nf4LSKVAiZgqcteoepw5btx1UsBadD1tLzcDwVAP8TwzKwXGik94lkju0XNnrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704739198; a=rsa-sha256; cv=none; b=DSCgZUyCCq6HuqNJ7OfyASUYlJsDq7ti2xmtJA8Ymtui3wbmaDoKhjcq4W7Gl8CBugZu1m EtXQ7NFN+61NqOfu/B1uFYKIuvZbhcTxJa8yEqwBRXY1n+Rajf9G83iylCTZxXsBW5GvPC 5PUamkxTOaM870uRw1/K4uPIu6tlW+qVAFUBt6YqIHtSh8gKbYRQys1n2pE0YfUyUPOmdG 8sNqwb96GHJsuHBvOunVI+xfZwLEhY8JaiB7zWd3y+Vy7AESDN5Z7U8dNvPz/UZSl457oP kWmkb0pbOa92K+d39M/u5CdIIYUDYga0aRaq4b5Tni581Y42LjEMliVI2OItuA== 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 4T82t61sTvzJYd; Mon, 8 Jan 2024 18:39:58 +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 408IdwG7023992; Mon, 8 Jan 2024 18:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408Idw03023989; Mon, 8 Jan 2024 18:39:58 GMT (envelope-from git) Date: Mon, 8 Jan 2024 18:39:58 GMT Message-Id: <202401081839.408Idw03023989@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: 429f14f83ae1 - main - tcp: clean PRR state after ECN congestion recovery. 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: 429f14f83ae1f6357a9455d4f075522420b01b03 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=429f14f83ae1f6357a9455d4f075522420b01b03 commit 429f14f83ae1f6357a9455d4f075522420b01b03 Author: Richard Scheffenegger AuthorDate: 2024-01-08 08:28:01 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-08 09:53:04 +0000 tcp: clean PRR state after ECN congestion recovery. PRR state was not properly reset on subsequent ECN CE events. Clean up after local transmission failures too. Reviewed by: tuexen, cc, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43170 --- sys/netinet/tcp_input.c | 1 + sys/netinet/tcp_output.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 0014c11d9daa..ed5f28490852 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -483,6 +483,7 @@ cc_post_recovery(struct tcpcb *tp, struct tcphdr *th) /* XXXLAS: EXIT_RECOVERY ? */ tp->t_bytes_acked = 0; tp->sackhint.delivered_data = 0; + tp->sackhint.prr_delivered = 0; tp->sackhint.prr_out = 0; } diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 8d863ffcf432..1ff6f5bee39a 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1663,6 +1663,8 @@ timer: if (flags & TH_FIN) tp->snd_nxt--; } + if (IN_RECOVERY(tp->t_flags)) + tp->sackhint.prr_out -= len; } SOCKBUF_UNLOCK_ASSERT(&so->so_snd); /* Check gotos. */ switch (error) {