From nobody Mon Jan 06 19:39:46 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 4YRkz66cd4z5k66q; Mon, 06 Jan 2025 19:39:46 +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 4YRkz65r42z4S2Z; Mon, 6 Jan 2025 19:39:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736192386; 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=9NIDJaZxDig4ktYgiNDviSjp08sbh08JrjbjCCRzKGM=; b=HQ6huq6ZZDo8x9VsdpAdw44mhfWPVe4Hw4Fp6PDUj+tUpL5WsrCRbqtzX7TYJplnYwECMn DrH8y3P/vxpU8gH2YBRqE9nYyijQK7H83kW7mC1e+SmD9smNEADzhaxIqAnf2D4cEfCxN7 bEgJggscUZKZrEme3GeyGlQ4/1fNN+Wyf/Xec7brJ5hUg6SGVT4ibirhdY7pfAQHXIkBH8 sco5Ib01fL86UDD3FhuaFq7g4UpsGkH1knXQqP3gqcTq/p9ua0pU9lPknsgP02EceywUPC CmO3SN4gddb7ZhopV3PHuMtrxoAgQdA2sy+XnLXecncH40+O2TTlalLkhE1HjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736192386; 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=9NIDJaZxDig4ktYgiNDviSjp08sbh08JrjbjCCRzKGM=; b=i6IYtPkcO5r8BsG5fQH9l9XYYVTnOTnBjy9CJtDVjCG635n2R2TlPUZvtpX/h8hDROMPRG UrlyKP4H+YjSB22yi5dSw2koQjRYvGnZzAhMvR0n2zP9WJsUFty4bS4tR7QNkU2FjzNVgR Le+aimIiUP1qazTl0jTxStHwW/OxHLqfoXMQPfrGyExhOiwrN0tOOo65ui6j0JYtvla65F IGA2Zux135RfdEMLxW65EOOnV2Ir2/MvrJdN4HEUJy2gZuCGB4A8EEtXaYVkbG2oR3pgz9 lnt7xQnjwX87VSq2VCDTEMaH4ClK0udg06QtRiKEQBk7rh8qARPBRpQCMVzEbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736192386; a=rsa-sha256; cv=none; b=JXYyCC97UAN12ggw4CUMpdZzEBgpdDk8u378SXX2Hq89UGhbDQnsRjZGD1OVAZ/jBnMIgm n5hBvCKscARzL4U9jazM+iP0OkorZJXyIy8PUqL7/olwG4eW35zaOw0IgmQ7vugnG01awf e8gf/TKRmiiIleX26rT04tXqw1EbW8h5a3OHBS0YOYXFm/AZULXGCNoFa8tCAwdhZ5kf6U tkaafQ1FIYipMQ5T4kLWfcj+wssLvBdaua0K9PL/FbytYpzbcGAxWBCAYFat+hdoJMeCpX ByC5/OThtOD6SiUuLk++o5UBpILk13J0PnveHQfLnZ1juoR1QJjLoT5EC+7Xnw== 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 4YRkz656wBzdy0; Mon, 06 Jan 2025 19:39:46 +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 506JdkAV077226; Mon, 6 Jan 2025 19:39:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 506JdkuK077223; Mon, 6 Jan 2025 19:39:46 GMT (envelope-from git) Date: Mon, 6 Jan 2025 19:39:46 GMT Message-Id: <202501061939.506JdkuK077223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: bb9525f30214 - main - 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/main X-Git-Reftype: branch X-Git-Commit: bb9525f30214e8b6c53c6cccd9e8f02e8f8e8c42 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bb9525f30214e8b6c53c6cccd9e8f02e8f8e8c42 commit bb9525f30214e8b6c53c6cccd9e8f02e8f8e8c42 Author: Michael Tuexen AuthorDate: 2025-01-06 19:35:11 +0000 Commit: Michael Tuexen CommitDate: 2025-01-06 19:39:40 +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 MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D48322 --- 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 cc0725324760..7baf1a626787 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -19943,10 +19943,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