From nobody Thu Jan 11 00:41:28 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 4T9QpK4TtGz56bXX; Thu, 11 Jan 2024 00:41:29 +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 4T9QpJ70xFz4JJd; Thu, 11 Jan 2024 00:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704933689; 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=Eka27TyUNzvK8ogwuXBBq1FK6M55vnZZ2MUYPmEyrE0=; b=T/6S/Y5S+xxwIbWrakG18kMpLavyympZeKxxq461Ob0QVLihY7KISVfU3THe3QLE6JxgxX zxqsX2kLiCRc5+TYNnUpSjIGGXrBOejl6nyMQpt+mZiNoilw3khmYx/UsOviZj95lcJ4uA do5uvoU5t7Wn8B3Fu4hPFqXaPkIqjDcjNkw4k+6xe8lApTRy2yH21q25Y9LvieeXOxN2zO 0MdjqvTuhj6rHQv74PcJ6ezexoxPi80Uhy5djQL29xzIkfLWZlnP+S4itXhBRlJHlrSEa0 uTG+JTdrZd//QpZ/EpbzJ2NzrELGutr1rJHiqW+24ggExoFrB8FvtuwC+fabkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704933689; 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=Eka27TyUNzvK8ogwuXBBq1FK6M55vnZZ2MUYPmEyrE0=; b=dUdVP366bdfPk7dK+2Qeku4BP6C6ZprePqCJ3i6y0HBxYKZWUW/ccsObCGfuk08/diSHhK AuFQl8DKPh4D268+dZ39ggOD9o0FjwDj91G6EIzw9hpWnRkWzW7IDWGQRV56uky5U1psd3 cTyv+AOTD003zehel4Ujl/l3RRAHWdNrWeeizPptQLBTj7L7QV6/VNnd3JPClC6KYPTY4H nsHwRd+EcilxO95zvEcAC/9qejU1di55ImBxZB49z0YpqTgA9mDKBFkaW6xKhl0x8nv8XA SFYjP+pG+HO17MgJwUnuxnvkWr3TCDcYu2l6dxyZ04ry5yHoTqy0f65lfxCdOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704933689; a=rsa-sha256; cv=none; b=JD6kDhgUN+GUGVZ+xGyAD+Fbkim1stG2FWWvOZKTo6KRBnKgLVG+gN8NP52mr4k+n3FG6W w80IR7V7U5v45VndGFNXC2xBXGZdiYl2MkjsyNQ/JImZ//D4kbXZLYz63TcrETt20kOk1d FY2v9htqtmOclX6en54h+JyWF6qtKqtNbqcCcqcP34dNcNv51KMyeOuhEa1SJtVgMrKK5a TEy4qLFDrxlXMZKYcsP+TAlwU4LeRiK01gTTpHGZTdgwpLkNkqQjT5fiG8WYn+MAq8Hq3K iYe+iK5PAhXVOpvV6/eyZm5BNVBQqvYxhTWktEYnARsTnY2PXcWrJWGJ5zvb2Q== 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 4T9QpJ5qqYzxby; Thu, 11 Jan 2024 00:41:28 +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 40B0fSTw013224; Thu, 11 Jan 2024 00:41:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B0fS1k013221; Thu, 11 Jan 2024 00:41:28 GMT (envelope-from git) Date: Thu, 11 Jan 2024 00:41:28 GMT Message-Id: <202401110041.40B0fS1k013221@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: 8923d34c6cbf - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 8923d34c6cbf68d506abd9fcf8a790a77eb952ad Auto-Submitted: auto-generated The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=8923d34c6cbf68d506abd9fcf8a790a77eb952ad commit 8923d34c6cbf68d506abd9fcf8a790a77eb952ad Author: Richard Scheffenegger AuthorDate: 2024-01-08 08:28:01 +0000 Commit: Richard Scheffenegger CommitDate: 2024-01-11 00:40:14 +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 9a5b9b05f210..262e95d08071 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -529,6 +529,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 3e1a2320f331..834bce35f5ba 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1691,6 +1691,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) {