From nobody Wed Feb 5 20:54:06 2025 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 4YpCC30GNbz5mNZ7; Wed, 05 Feb 2025 20:54:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YpCC232RZz3THn; Wed, 05 Feb 2025 20:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788846; 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=6/Ss+2diVY6GYePf6XksdYsrd+TqfK6QR/pCYvxrtrE=; b=XPAp0ViT97subYephvRcjYvuH9OHxhqLc5IUhuVdWZSWTUoj5/W1rGUj340wq0hHhoMXdP iPGqEJzlCYnryKU15Ix9R6ZhVOq+9cJysNDr6TXmzzl6v4eTKrkN9VZHaceVEBFYA+92aO WWEVlryM1Uq7o5J3srzZjw5o99J6BvM/0JvjDqqkW+RvUekptabCeJ7oYrcID6a8HJADTf p5iI3/aVU6DITywPUh82zh40r3vmD52JuMgz9FYJyAfGRCZgXGoPx363SDUbRjprf1F4S+ w071F3gjQ0//Jsi1sPAQRCdWOXYoSIAJILnvx+XxsXOByJ/QG6CySDIO9lDvxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788846; 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=6/Ss+2diVY6GYePf6XksdYsrd+TqfK6QR/pCYvxrtrE=; b=a5hyllMdlxWVFooqSjpD3m5hTaIjs9cI6pb9vopWf3BOEGo8lFm4eO34zVh/k9QdvW5scr BukgKZpE5BfoE+Q9aQ/coZ9d1GypTac5dliFND7rrJJythVlBbWs1mJNb3hNc8+1wVajDR WrMBcj8txV6F3g0/d1Ae5oxB0BbQ+Wv1XgSgiCppZpdeibQ9oH+LomqDWO7CRoZ8zSmnTg pKTfiwSllO7I2qyWOz0YQkGOaXOHNOl6hoi0L0AAfnaxkFTTdyFLsJg24RqtA9BzTfrHL8 j6hPmZqUjTD/DWK3oEIqY+q6SxSRzVilEsy8RrU1qqbihlyN/5fFdeuJonrMsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788846; a=rsa-sha256; cv=none; b=RlpJfnPoDOk+kXk9o8g+dJL5OWNB+fyb6xD/YONZcqtf2LtkDdchH6MEJOcXve2LUlHZOv gQe8pMFLhK8PJmYIBZE5qsaWP2ZoN3b3KSr5bbtjARVrVjdMk/Oe3Wkh7qEQw6zyxQgk/2 y82qsKSpkSoLfVGyVBFvgv6k7l0XeNuCxW0lPVFXbVGtjSYvaaWqYZh6oeLDvgzA7ekqwM AZkYun+wMQi2i1pdvmk7P34HuzNaluzUaOCyxrb1WrC0wbLzm1kosFmqT7seiRqLqGeyIs ZTr5hLXmHYL+54nvdcN+0Ds7zt/67GoLtrPy+R2/FZP5nanyubWDcCRKtAAxFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpCC22Yv8z16Pj; Wed, 05 Feb 2025 20:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 515Ks6Qt003523; Wed, 5 Feb 2025 20:54:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515Ks6aJ003520; Wed, 5 Feb 2025 20:54:06 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:54:06 GMT Message-Id: <202502052054.515Ks6aJ003520@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: 86ec7e524a5d - stable/14 - TCP RACK: fix TCP fast open 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: 86ec7e524a5d6934b6da618e94dfc35927dba3f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=86ec7e524a5d6934b6da618e94dfc35927dba3f1 commit 86ec7e524a5d6934b6da618e94dfc35927dba3f1 Author: Michael Tuexen AuthorDate: 2025-01-06 19:35:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 09:54:19 +0000 TCP RACK: fix TCP fast open Do not jump to a place in the code, which requires several variables to be set (segsize, minseg, idle, len, sb_offset), which is not true. To avoid using these variables, start the HPTS timer explicitly. This fix only applies to the client side using TCP fast open. Approved by: rrs CID: 1523766 CID: 1523770 CID: 1523786 CID: 1523801 CID: 1523809 Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48322 (cherry picked from commit bb9525f30214e8b6c53c6cccd9e8f02e8f8e8c42) --- sys/netinet/tcp_stacks/rack.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index c9fd18be1ede..a2325b88751b 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -20154,10 +20154,11 @@ rack_output(struct tcpcb *tp) (tp->t_state == TCPS_SYN_SENT)) && SEQ_GT(tp->snd_max, tp->snd_una) && /* initial SYN or SYN|ACK sent */ (tp->t_rxtshift == 0)) { /* not a retransmit */ - cwnd_to_use = rack->r_ctl.cwnd_to_use = tp->snd_cwnd; - so = inp->inp_socket; - sb = &so->so_snd; - goto just_return_nolock; + rack_start_hpts_timer(rack, tp, cts, 0, 0, 0); +#ifdef TCP_ACCOUNTING + sched_unpin(); +#endif + return (0); } /* * Determine length of data that should be transmitted, and flags