From owner-dev-commits-src-branches@freebsd.org Sun Apr 11 11:10:22 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 366A65C96FE; Sun, 11 Apr 2021 11:10:22 +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 4FJ8Kp0qq0z3L10; Sun, 11 Apr 2021 11:10:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0AD5E22C65; Sun, 11 Apr 2021 11:10:22 +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 13BBALOg028990; Sun, 11 Apr 2021 11:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13BBALTV028989; Sun, 11 Apr 2021 11:10:21 GMT (envelope-from git) Date: Sun, 11 Apr 2021 11:10:21 GMT Message-Id: <202104111110.13BBALTV028989@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: 8d589e0cf979 - stable/11 - [tcp] Fix ECN on finalizing sessions. 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/11 X-Git-Reftype: branch X-Git-Commit: 8d589e0cf9793996f24f0d6fa9fddbf8b2ce0cdd Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 11:10:22 -0000 The branch stable/11 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=8d589e0cf9793996f24f0d6fa9fddbf8b2ce0cdd commit 8d589e0cf9793996f24f0d6fa9fddbf8b2ce0cdd Author: Richard Scheffenegger AuthorDate: 2021-04-08 12:50:34 +0000 Commit: Richard Scheffenegger CommitDate: 2021-04-11 10:45:11 +0000 [tcp] Fix ECN on finalizing sessions. A subtle oversight would subtly change new data packets sent after a shutdown() or close() call, while the send buffer is still draining. MFC after: 3 days Reviewed By: #transport, tuexen Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D29616 (cherry picked from commit 9f2eeb02623d6a847a90da68a5892c25b14ce2d4) --- sys/netinet/tcp_output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index d7fcd626d9cd..53e3623e7616 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1152,8 +1152,8 @@ send: } else flags |= TH_ECE|TH_CWR; } - - if (tp->t_state == TCPS_ESTABLISHED && + + if (TCPS_HAVEESTABLISHED(tp->t_state) && (tp->t_flags & TF_ECN_PERMIT)) { /* * If the peer has ECN, mark data packets with