From nobody Thu Jan 11 00:42:27 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 4T9QqR24tpz56cTN; Thu, 11 Jan 2024 00:42:27 +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 4T9QqR1fzBz4JmQ; Thu, 11 Jan 2024 00:42:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704933747; 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=prvkYTjgGPnmi0LKOzzjxve1fNeGgKhWYYaVDKjQ1NM=; b=RVWRBijBJUw0Id7iramjKgYcGi2iNZVgEaYE20cfPc2JPvO5q/piw9+7cxOOzE4tJPPsfb uIX60lrruD1d9KWmaTcxe9MMNzxV9wNRoO2k7h6ohdPLJxrrCdkhY40ZRlDIDYJ1VGguXs H3eWiF2AMVPuxqeTeAKx+6uzQkW35DDWx3ee2EoH9uWMhnFuUp5wzotdo2gogTxRUzi/0H 6f9nVOiNxAHZoMaRiZJmrrQNBXrGmdYhEm3858EDANjmg5esJ7fqIBTuNteX5ea5rdpFx+ PnRF6hD7qrfcsGoTag/drQbhk8ViQatJNWl8vifb6OdoOLhkbn5b07pkj6LVeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704933747; 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=prvkYTjgGPnmi0LKOzzjxve1fNeGgKhWYYaVDKjQ1NM=; b=K7w/IBYN6ajS+7ZWheQnsO3ltMKufsoT9onvA1OXKYDzz63HBfbZbI3XGcfnw8zVwsOVUR AvUQMiNX0q0KzGkIfj9FP9gcTn5U4tEGfYUO8KqAuL8fPhWm7kTnqhyoNjSutIi1C9pHYp RcnvA7pfxwSKqnV0fWyoDucGYjI243q2GHvINrOLSU4hpSi7iAwQgrEk47aSOD11A4R8s7 O2zpEYkVXJi87YlgV7TZXOlrudw2cxL8GUzc1VnZ8IF/4YXaIqy3+Fj3F4o1CJ/ZWIhRi3 eP5aFt5lpePn6+CjDB4HSzZfUoApw+W0yxDYyX07crCrTFZoFN7x1wZ2/yFVog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704933747; a=rsa-sha256; cv=none; b=XuAZsnRrqXNoKUpEBN22yAWrmVJcDdLk5H4tBv0/r1fjDirB1ITuTGV94uCk993V184/Jt pGGsnvcOR77gQnuGZ67VSVAIQVF2JX8ezgI9s+1bI+fMPmhO2WgMRw7qt9g0ng8xvVCdZi 7nqYU/VANi7yXSAmVNX8T964QFCNIHCJxzUwdi0stzSvdA5jMDSpSuoXDKfWD3Rf5BCgCZ TRsTnjCEE0kMhvUcXRA6r7DD3iWqYeIXeuYUsyEciCjbpMFcpoUjCqDKvhTejM5mU6oOpB jaMNYgEf4sg33nCNQVK9Hfm1x49jZQV0lNe0gXhRcqRW1EGgwKf+AaTP4G+7cA== 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 4T9QqR0kW1zxSf; Thu, 11 Jan 2024 00:42:27 +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 40B0gR5D020272; Thu, 11 Jan 2024 00:42:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B0gRJX020269; Thu, 11 Jan 2024 00:42:27 GMT (envelope-from git) Date: Thu, 11 Jan 2024 00:42:27 GMT Message-Id: <202401110042.40B0gRJX020269@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: 407054ed4891 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 407054ed48916e8d19d0b8d0cb9f5df16a27c69c Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=407054ed48916e8d19d0b8d0cb9f5df16a27c69c commit 407054ed48916e8d19d0b8d0cb9f5df16a27c69c Author: Richard Scheffenegger AuthorDate: 2024-01-08 08:28:01 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-11 00:33:53 +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 (cherry picked from commit 429f14f83ae1f6357a9455d4f075522420b01b03) --- 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 2d7a6fa11b4e..9eefef3ea81e 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -487,6 +487,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 8efea91e116f..549218badcec 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1665,6 +1665,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) {