From nobody Mon Oct 16 15:51:16 2023 X-Original-To: dev-commits-src-branches@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 4S8M6F24dxz4xW7d; Mon, 16 Oct 2023 15:51:17 +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 4S8M6F19xMz4cH1; Mon, 16 Oct 2023 15:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697471477; 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=rD+ALDOLVcEvlgBs1Mx9MFAbnV9vYI42ZlHZ4ogPuIE=; b=mI7fe/nTQ2ZpQBBlC6f/X/SXYLgeJDSbgv0msi/SzdJVfGm9XN4vPY+cl5GyJwmebmXSc2 RaM+EpUY4KIyyIuSYlU/owmXfvClSxv8winKwem6Y+8AL+bUoeYXT23+hJ3ghD6AO8QxvJ NpLLWd/S1Y5zOirYYYfQXiW+Rynm8f1B8zmRdY47ZbXe0OGOprgEu3yUp9r+DJzm6saQK7 6JtZY2vcSLVrMrG8IDTNJMRo2STM8OUH0X9Ar2lZUmnwZyIHdOIYDCNosJa9i3vhC9CGce QOfAXy2RUQVP2v3kTdmV8ihfe5pwFcWTISkmPkZFJIfxPG2ICVj/c5qZ5JzJiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697471477; a=rsa-sha256; cv=none; b=Z3SPhli/GrgVnH/Bg0+ZqLPdd9WyBH796HN9FQSa1lr9S4Xzd3QswILT/qu33jHGvf5pZ0 M7CEubktZyZeNqCqhzheRRYpTgWVoPCjKDIJyj+SeaLsYmcPKTy9tlFaC+56bpXsLbO/iD Gkk1Xomz8qEfLvLS6jbfreDQ625vK+J6sIk/asr653mJIvlVXn6c31iRvInBJh/OIQetsB gVSs8SKr1AWAVo5O1Ns+DtVWsIOZegAfLSmLBP35MDP21uVeiC705+rpHUauL0T2M86bJ2 mzMTL+DQ7A6ETtVuksmfdS0gey3iRG93HYhSqRUSRzlHWDbvA/M1oG8NbtH6IA== 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=1697471477; 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=rD+ALDOLVcEvlgBs1Mx9MFAbnV9vYI42ZlHZ4ogPuIE=; b=THaHTvCI+1hySRfBXfOJBanvTfjp/g98r0jD8KqoU+JTIkRdJAU3SXewykvg4GtvEqz3lu cLsJ7ZiGlk1Z53dO+7JxoaE5vsWc1PnjU5fjTKx8m4KyobrY2xdrrhp2AhTT5GxFuKHKjY 1L21fZcodQKPOMAQjFuBpTlu7+RymeXxnNJhxZt0kJ/TCeEU+FR+i8zeLuBzfC+aokwC5C 1vJ/im97HwcRZuiwfC2OZBhGVeOdjASnN6vXxieFjGyu7+X2gjCZLEZzRWQFBa6zo7F2v5 yTqTRm8Z8Z1qs61ZKklW07Rgc/sTmf+QhKTqsyH1rTBx4lJDN/Rz/uceLgqEiA== 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 4S8M6F0GXszm4N; Mon, 16 Oct 2023 15:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39GFpGBR014476; Mon, 16 Oct 2023 15:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39GFpG4G014473; Mon, 16 Oct 2023 15:51:16 GMT (envelope-from git) Date: Mon, 16 Oct 2023 15:51:16 GMT Message-Id: <202310161551.39GFpG4G014473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 0a31dbecd43d - stable/12 - tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize' List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0a31dbecd43d3aaa4be053a9d3c21c3c81077604 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=0a31dbecd43d3aaa4be053a9d3c21c3c81077604 commit 0a31dbecd43d3aaa4be053a9d3c21c3c81077604 Author: Zhenlei Huang AuthorDate: 2023-10-08 10:03:59 +0000 Commit: Zhenlei Huang CommitDate: 2023-10-16 15:49:59 +0000 tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize' No functional change intended. Reviewed by: cc, rscheff, #transport MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41998 (cherry picked from commit 38ecc80b2a4e5e11ece83ca4df63632f0b6fa394) (cherry picked from commit 3a97686fc11ae51ceb4004c07702a8a20f71410d) (cherry picked from commit 379f41a117eb8aaf1dd43414658606d2ef0534a7) --- sys/netinet/tcp_subr.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index c82a5bf21a15..2a5ab3d402c8 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -216,8 +216,17 @@ static int tcp_log_debug = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_debug, CTLFLAG_RW, &tcp_log_debug, 0, "Log errors caused by incoming TCP segments"); -static int tcp_tcbhashsize; -SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, +/* + * Target size of TCP PCB hash tables. Must be a power of two. + * + * Note that this can be overridden by the kernel environment + * variable net.inet.tcp.tcbhashsize + */ +#ifndef TCBHASHSIZE +#define TCBHASHSIZE 0 +#endif +static int tcp_tcbhashsize = TCBHASHSIZE; +SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN, &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable"); static int do_tcpdrain = 1; @@ -692,16 +701,6 @@ tcp_default_fb_fini(struct tcpcb *tp, int tcb_is_purged) return; } -/* - * Target size of TCP PCB hash tables. Must be a power of two. - * - * Note that this can be overridden by the kernel environment - * variable net.inet.tcp.tcbhashsize - */ -#ifndef TCBHASHSIZE -#define TCBHASHSIZE 0 -#endif - /* * XXX * Callouts should be moved into struct tcp directly. They are currently @@ -1017,11 +1016,8 @@ deregister_tcp_functions(struct tcp_function_block *blk, bool quiesce, void tcp_init(void) { - const char *tcbhash_tuneable; int hashsize; - tcbhash_tuneable = "net.inet.tcp.tcbhashsize"; - #ifdef TCP_HHOOK if (hhook_head_register(HHOOK_TYPE_TCP, HHOOK_TCP_EST_IN, &V_tcp_hhh[HHOOK_TCP_EST_IN], HHOOK_NOWAIT|HHOOK_HEADISINVNET) != 0) @@ -1030,8 +1026,7 @@ tcp_init(void) &V_tcp_hhh[HHOOK_TCP_EST_OUT], HHOOK_NOWAIT|HHOOK_HEADISINVNET) != 0) printf("%s: WARNING: unable to register helper hook\n", __func__); #endif - hashsize = TCBHASHSIZE; - TUNABLE_INT_FETCH(tcbhash_tuneable, &hashsize); + hashsize = tcp_tcbhashsize; if (hashsize == 0) { /* * Auto tune the hash size based on maxsockets. @@ -1048,7 +1043,7 @@ tcp_init(void) hashsize = 512; if (bootverbose && IS_DEFAULT_VNET(curvnet)) printf("%s: %s auto tuned to %d\n", __func__, - tcbhash_tuneable, hashsize); + "net.inet.tcp.tcbhashsize", hashsize); } /* * We require a hashsize to be a power of two.