From owner-dev-commits-src-branches@freebsd.org Mon Mar 8 12:28:01 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 698C75718B7; Mon, 8 Mar 2021 12:28:01 +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 4DvHg52Sc6z4Zyk; Mon, 8 Mar 2021 12:28:01 +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 4318CAFB; Mon, 8 Mar 2021 12:28:01 +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 128CS1w9036212; Mon, 8 Mar 2021 12:28:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 128CS1gn036211; Mon, 8 Mar 2021 12:28:01 GMT (envelope-from git) Date: Mon, 8 Mar 2021 12:28:01 GMT Message-Id: <202103081228.128CS1gn036211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 873f8376015c - stable/13 - rack: unbreak TCP fast open for the client side MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 873f8376015c12febec3619976a8c30fbead4ad6 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: Mon, 08 Mar 2021 12:28:01 -0000 The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=873f8376015c12febec3619976a8c30fbead4ad6 commit 873f8376015c12febec3619976a8c30fbead4ad6 Author: Michael Tuexen AuthorDate: 2021-03-05 14:57:26 +0000 Commit: Michael Tuexen CommitDate: 2021-03-08 12:27:30 +0000 rack: unbreak TCP fast open for the client side Allow sending user data on the SYN segment. Reviewed by: rrs Differential Revision: https://reviews.freebsd.org/D29082 Sponsored by: Netflix, Inc. (cherry picked from commit 705d06b289e9821439b7b694d766cad75bc064e5) --- sys/netinet/tcp_stacks/rack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 4d1a4cc8a0eb..104468bee53b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -12297,7 +12297,8 @@ again: * If sack_rxmit is true we are retransmitting from the scoreboard * in which case len is already set. */ - if ((sack_rxmit == 0) && TCPS_HAVEESTABLISHED(tp->t_state)) { + if ((sack_rxmit == 0) && + (TCPS_HAVEESTABLISHED(tp->t_state) || IS_FASTOPEN(tp->t_flags))) { uint32_t avail; avail = sbavail(sb);