From nobody Sat Aug 03 20:56:03 2024 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 4Wbw375Btvz5T3XF; Sat, 03 Aug 2024 20:56:03 +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 4Wbw37342mz442H; Sat, 3 Aug 2024 20:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722718563; 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=sKzcJj3oAUynQtJgZMRRWtzjZuFIoMrC28eEo7bWxoU=; b=vU48vRmLjj4HMCQ29gJ8eyBjfZ0uwx8C0DIEq4no5JGibnY6MSnhD9nWMstKY/KkkekUOR 82Xjitgali9Nt1t53a2mvhs/2+ZoZVvdwSd62OYZm7+auGU9+q0gn06bYqQ1PeHSHaM0ce 8ZLiqWKhK14gJ9s4fNZQliod+5exXKfunvnEp1Q3QLvU7Db9IJlhe3D5dm1OIHHsvAbNbl ruo7CQQ9FVPAU56Ahwbbmk4Ic+Kzl+gjTLejtF5VtmMTkhoZLTwQGXWnoZWmU490Li2TuI 6ZJjN2QdMd7DTBo8kWXP3CERpbXlVP2ui5FxWZPlCYH3bVZEqBcUysJk0gZ62A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722718563; a=rsa-sha256; cv=none; b=CKTf0TWW6Nl5PFeSrLDHnqWMC2B7ugni+7HZ2VRf0JidXYbDxSN+MVlmDKP7Y26+Qnm6Wi YvO7Rm/jaAeQj9GoFfgXagTuTDH+/vvqI4tI25sAQaus8YORYRDyr7WjyNCFeEKBq0ExWH q95fBGQW/aIS2xJeO7hsMEgRY+5vq+kCEXUMhCOi7Hjsr5w70r3wivozWKp1VQ9zXgS7SK kNYkHRd9OdplwwdQSxUqs3mSGu9lR6EFScpp1Khtp9T7YHEMkCZvyIrRvjoDDVBIj2NOPu vl3Pc/u29N59v9MJpUYSvEpMTIU/XcR30FgCeqPozQ9GtQ2eKO6Ms14qRUgyiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722718563; 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=sKzcJj3oAUynQtJgZMRRWtzjZuFIoMrC28eEo7bWxoU=; b=WhCR0/fBdyT708eJZ+Otm3XdTirvYVoqNQGO5hUACy4s5+bRozWM7/y/iB0VAvbINgxYwR ga751KlkRsjJzdAWb5UTF4Beq31g+3tMRKxHTeYNwJaEdHB1jTWwq06CiGmtvy/EcOI/Jr JfxpPpiZ3z4VTmSFm1ue587fbosYMxmAbLVo2Sjl9DtopozexiEQmktWLQQEgx94hNMDTR +DkKQSs6oDXFPLE0DQtk3DCAzuqMnpvsJPXqjn00H+e+tpuIocMh1ZH+yCbS2SB3xWvtom BR5KBFT2if8DK8XwxMOeJKiDvldAAPOsLhM5VhVVh0ZW3jBJd45YmHh8xUeiOQ== 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 4Wbw372XLjzRCP; Sat, 3 Aug 2024 20:56:03 +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 473Ku3uR072565; Sat, 3 Aug 2024 20:56:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473Ku3A4072562; Sat, 3 Aug 2024 20:56:03 GMT (envelope-from git) Date: Sat, 3 Aug 2024 20:56:03 GMT Message-Id: <202408032056.473Ku3A4072562@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: fd53594ae75d - main - tcp: retire sysctl variable functions_inherit_listen_socket_stack 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: fd53594ae75dc6f8b0afad5adfe8dc78eccac161 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fd53594ae75dc6f8b0afad5adfe8dc78eccac161 commit fd53594ae75dc6f8b0afad5adfe8dc78eccac161 Author: Michael Tuexen AuthorDate: 2024-08-03 20:52:17 +0000 Commit: Michael Tuexen CommitDate: 2024-08-03 20:52:17 +0000 tcp: retire sysctl variable functions_inherit_listen_socket_stack The default was true and it is consistent to inherit the TCP function block from the listener as most of the other parameters. Reviewed by: Peter Lei, cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46141 --- share/man/man4/tcp.4 | 7 +------ sys/netinet/tcp_syncache.c | 15 +-------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 70356baa2145..192fa90a1635 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 28, 2024 +.Dd August 3, 2024 .Dt TCP 4 .Os .Sh NAME @@ -622,11 +622,6 @@ Defaults to 60 seconds. List of available TCP function blocks (TCP stacks). .It Va functions_default The default TCP function block (TCP stack). -.It Va functions_inherit_listen_socket_stack -Determines whether to inherit listen socket's TCP stack or use the current -system default TCP stack, as defined by -.Va functions_default . -Default is true. .It Va hostcache The TCP host cache is used to cache connection details and metrics to improve future performance of connections between the same hosts. diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index c797c6a99f4f..62a4a5a28878 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -114,14 +114,6 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, syncookies_only, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(tcp_syncookiesonly), 0, "Use only TCP SYN cookies"); -VNET_DEFINE_STATIC(int, functions_inherit_listen_socket_stack) = 1; -#define V_functions_inherit_listen_socket_stack \ - VNET(functions_inherit_listen_socket_stack) -SYSCTL_INT(_net_inet_tcp, OID_AUTO, functions_inherit_listen_socket_stack, - CTLFLAG_VNET | CTLFLAG_RW, - &VNET_NAME(functions_inherit_listen_socket_stack), 0, - "Inherit listen socket's stack"); - #ifdef TCP_OFFLOAD #define ADDED_BY_TOE(sc) ((sc)->sc_tod != NULL) #endif @@ -777,7 +769,6 @@ done: static struct socket * syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) { - struct tcpcb *listening_tcb; struct inpcb *inp = NULL; struct socket *so; struct tcpcb *tp; @@ -802,11 +793,7 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) goto allocfail; } inp = sotoinpcb(so); - if (V_functions_inherit_listen_socket_stack) - listening_tcb = sototcpcb(lso); - else - listening_tcb = NULL; - if ((tp = tcp_newtcpcb(inp, listening_tcb)) == NULL) { + if ((tp = tcp_newtcpcb(inp, sototcpcb(lso))) == NULL) { in_pcbfree(inp); sodealloc(so); goto allocfail;