Page MenuHomeFreeBSD
Files F165166698

D41998.diff
No OneTemporary
Actions

D41998.diff
View Options

diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -305,8 +305,17 @@
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 @@
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 @@
static void
tcp_init(void *arg __unused)
{
- const char *tcbhash_tuneable;
int hashsize;
tcp_reass_global_init();
@@ -1576,9 +1574,7 @@
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 @@
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.

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 7, 12:47 PM (22 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36173176
Default Alt Text
D41998.diff (1 KB)

Event Timeline