upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcp: Simplify the initialization of loader tunable 'net.inet.tcp.tcbhashsize'

Browse source 
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)
This commit is contained in:
Zhenlei Huang 2023-10-08 18:03:59 +08:00
parent 9ef162b239
commit 3a97686fc1
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sys/netinet/tcp_subr.c
View file

@ -305,8 +305,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;
@ -1152,16 +1161,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
MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers");
MALLOC_DEFINE(M_TCPFUNCTIONS, "tcpfunc", "TCP function set memory");
@ -1508,7 +1507,6 @@ VNET_SYSINIT(tcp_vnet_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH,
static void
tcp_init(void *arg __unused)
{
const char *tcbhash_tuneable;
int hashsize;
tcp_reass_global_init();
@ -1576,9 +1574,7 @@ tcp_init(void *arg __unused)
tcp_pcap_init();
#endif
hashsize = TCBHASHSIZE;
tcbhash_tuneable = "net.inet.tcp.tcbhashsize";
TUNABLE_INT_FETCH(tcbhash_tuneable, &hashsize);
hashsize = tcp_tcbhashsize;
if (hashsize == 0) {
/*
* Auto tune the hash size based on maxsockets.
@ -1595,7 +1591,7 @@ tcp_init(void *arg __unused)
hashsize = 512;
if (bootverbose)
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.