From nobody Wed Feb 5 20:54:32 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 4YpCCY0jgmz5mP0c; Wed, 05 Feb 2025 20:54:33 +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 4YpCCX5BxPz3Tph; Wed, 05 Feb 2025 20:54:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788872; 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=s+ea3vZ5OaO3+2ncEIEbmHJ58PDEXAjCo++9OM9UnP8=; b=KucacIZjCkTKWLUgTU7RzEjmfdGD9KufhAb3NU8O5tmCD+8a4g8By65W8zwrMspCjWDQXF hRad3DsN2I8dRlY2XCcbUUwRjHFEUEActBoD+x7X+B1CCJGMg8tddR9oqA1nLXW3cjn3cz OJbOvuLwSzBfNh1EMv0oG3m4Aw/9iSkYp11bGG1ZiKg/IuJsuKIFqCRl+5DTlfy9ip6SIx rVHfVQxuFidyyYz5rI6maEMPZZRLD1oLbBLW6tnEkVN1QJrtWd8nTOfhPdeX476K26sV82 5j/UimE+bylGsmIUcNHsi5/z3LPGDO2W2wcy3x1zCdMwDDttDk095xdIFeErRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738788872; 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=s+ea3vZ5OaO3+2ncEIEbmHJ58PDEXAjCo++9OM9UnP8=; b=YfGpEzs5wMzZetJahMxlSUnc/FnUhvN8MAxaiBLc7MUOUs1vxCa9AkwYA0+9InE748dWjK NDw5dMfJTAO961xuyYozg9GtjMDBEouWSCdNxcdLbUD4DlzH3lkaNP5KsQEmka67MNJ6ZT 4Jxt9Cj49gWfM9zIpgD1pMLDe72zEDICe5/ycmVJgCEMFDCVGA2PfdJier75F+OMaYprbj B3v4BlJeP20+cpugpXwA3zHC3TKEehfreFJ8W1kTVaq3xM+/C/nxvEdH5c60zwvbofwN9i NItVIkqqd2nVd4zasLyCaxE+ZA0uFc9z2XvpJtFFWY6vh463Ehwd272LxwaCMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738788872; a=rsa-sha256; cv=none; b=BSl6Tk9VC3cnmlSWyKKFB7Uqw9hznfPs4IfNaOZ+wgTdWSq6P6UUYS4rWAKJilnBq4tXKy D8A9qmcBzz0EpcvuJCUY8gCqytQwzzvi7Hi14Nx4/dURmcaR24xID2vW7al6cW/Fk66Xed WQtiWgQ5x8DzDoPznoxe+4cjnInapmGoweBDrLNn8kkwm/O+o51aDUEfQCHMgdDH3KNq6N fxwbYus8eWRv7UC7vrqcqPmPO8EJ/Fs2jmm/VC172UTCWA7+92AeIHmBZj+Hh4ChlniN8s hMcwdzdjTlCYDXfHbpPzumBNphhHD2DYt+m0pIJ6+LNz/1DacbA549FA2aCSlA== 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 4YpCCX4pg1z16Pk; Wed, 05 Feb 2025 20:54:32 +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 515KsWLl003748; Wed, 5 Feb 2025 20:54:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515KsWLY003745; Wed, 5 Feb 2025 20:54:32 GMT (envelope-from git) Date: Wed, 5 Feb 2025 20:54:32 GMT Message-Id: <202502052054.515KsWLY003745@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: 9698788212e8 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 9698788212e8f772885098a511fafe7fc5d4e4df Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9698788212e8f772885098a511fafe7fc5d4e4df commit 9698788212e8f772885098a511fafe7fc5d4e4df Author: Michael Tuexen AuthorDate: 2025-01-06 19:35:11 +0000 Commit: Michael Tuexen CommitDate: 2025-02-05 20:39:50 +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 86495bf3291e..b4c4a6ed85dc 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -16366,10 +16366,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