From 10b2fe8deaf19b4c81cb9088e607c6b818b49a2b Mon Sep 17 00:00:00 2001 From: ps Date: Fri, 21 Apr 2006 09:25:40 +0000 Subject: Allow for nmbclusters and maxsockets to be increased via sysctl. An eventhandler is used to update all the various zones that depend on these values. --- sys/kern/kern_mbuf.c | 20 +++++++++++++++++++- sys/kern/uipc_domain.c | 10 ++++++++++ sys/kern/uipc_sockbuf.c | 26 ++++++++++++++++++++++++-- sys/kern/uipc_socket2.c | 26 ++++++++++++++++++++++++-- sys/kern/uipc_usrreq.c | 12 +++++++++++- sys/netinet/ip_divert.c | 9 +++++++++ sys/netinet/ip_input.c | 13 +++++++++++++ sys/netinet/raw_ip.c | 9 +++++++++ sys/netinet/tcp_input.c | 10 ++++++++++ sys/netinet/tcp_reass.c | 10 ++++++++++ sys/netinet/tcp_subr.c | 11 +++++++++++ sys/netinet/tcp_timewait.c | 11 +++++++++++ sys/netinet/udp_usrreq.c | 10 ++++++++++ sys/netinet6/frag6.c | 10 ++++++++++ sys/sys/eventhandler.h | 3 +++ 15 files changed, 184 insertions(+), 6 deletions(-) (limited to 'sys') diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 84682de..7f39bd8 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -112,7 +112,25 @@ SYSINIT(tunable_mbinit, SI_SUB_TUNABLES, SI_ORDER_ANY, tunable_mbinit, NULL); SYSCTL_DECL(_kern_ipc); /* XXX: These should be tuneables. Can't change UMA limits on the fly. */ -SYSCTL_INT(_kern_ipc, OID_AUTO, nmbclusters, CTLFLAG_RW, &nmbclusters, 0, +static int +sysctl_nmbclusters(SYSCTL_HANDLER_ARGS) +{ + int error, newnmbclusters; + + newnmbclusters = nmbclusters; + error = sysctl_handle_int(oidp, &newnmbclusters, sizeof(int), req); + if (error == 0 && req->newptr) { + if (newnmbclusters > nmbclusters) { + nmbclusters = newnmbclusters; + uma_zone_set_max(zone_clust, nmbclusters); + EVENTHANDLER_INVOKE(nmbclusters_change); + } else + error = EINVAL; + } + return (error); +} +SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbclusters, CTLTYPE_INT|CTLFLAG_RW, +&nmbclusters, 0, sysctl_nmbclusters, "IU", "Maximum number of mbuf clusters allowed"); SYSCTL_INT(_kern_ipc, OID_AUTO, nmbjumbop, CTLFLAG_RW, &nmbjumbop, 0, "Maximum number of mbuf page size jumbo clusters allowed"); diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 7a26ff5..6adb336 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -189,6 +190,13 @@ net_add_domain(void *data) net_init_domain(dp); } +static void +socket_zone_change(void *tag) +{ + + uma_zone_set_max(socket_zone, maxsockets); +} + /* ARGSUSED*/ static void domaininit(void *dummy) @@ -201,6 +209,8 @@ domaininit(void *dummy) socket_zone = uma_zcreate("socket", sizeof(struct socket), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(socket_zone, maxsockets); + EVENTHANDLER_REGISTER(maxsockets_change, socket_zone_change, NULL, + EVENTHANDLER_PRI_FIRST); if (max_linkhdr < 16) /* XXX */ max_linkhdr = 16; diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 4afe8c5..b18ff4a 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include /* for aio_swake proto */ #include #include +#include #include /* for maxfiles */ #include #include @@ -1508,8 +1509,29 @@ static int dummy; SYSCTL_INT(_kern, KERN_DUMMY, dummy, CTLFLAG_RW, &dummy, 0, ""); SYSCTL_OID(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, CTLTYPE_ULONG|CTLFLAG_RW, &sb_max, 0, sysctl_handle_sb_max, "LU", "Maximum socket buffer size"); -SYSCTL_INT(_kern_ipc, OID_AUTO, maxsockets, CTLFLAG_RDTUN, - &maxsockets, 0, "Maximum number of sockets avaliable"); +static int +sysctl_maxsockets(SYSCTL_HANDLER_ARGS) +{ + int error, newmaxsockets; + + newmaxsockets = maxsockets; + error = sysctl_handle_int(oidp, &newmaxsockets, sizeof(int), req); + if (error == 0 && req->newptr) { + if (newmaxsockets > maxsockets) { + maxsockets = newmaxsockets; + if (maxsockets > ((maxfiles / 4) * 3)) { + maxfiles = (maxsockets * 5) / 4; + maxfilesperproc = (maxfiles * 9) / 10; + } + EVENTHANDLER_INVOKE(maxsockets_change); + } else + error = EINVAL; + } + return (error); +} +SYSCTL_PROC(_kern_ipc, OID_AUTO, maxsockets, CTLTYPE_INT|CTLFLAG_RW, + &maxsockets, 0, sysctl_maxsockets, "IU", + "Maximum number of sockets avaliable"); SYSCTL_ULONG(_kern_ipc, KIPC_SOCKBUF_WASTE, sockbuf_waste_factor, CTLFLAG_RW, &sb_efficiency, 0, ""); diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 4afe8c5..b18ff4a 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include /* for aio_swake proto */ #include #include +#include #include /* for maxfiles */ #include #include @@ -1508,8 +1509,29 @@ static int dummy; SYSCTL_INT(_kern, KERN_DUMMY, dummy, CTLFLAG_RW, &dummy, 0, ""); SYSCTL_OID(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, CTLTYPE_ULONG|CTLFLAG_RW, &sb_max, 0, sysctl_handle_sb_max, "LU", "Maximum socket buffer size"); -SYSCTL_INT(_kern_ipc, OID_AUTO, maxsockets, CTLFLAG_RDTUN, - &maxsockets, 0, "Maximum number of sockets avaliable"); +static int +sysctl_maxsockets(SYSCTL_HANDLER_ARGS) +{ + int error, newmaxsockets; + + newmaxsockets = maxsockets; + error = sysctl_handle_int(oidp, &newmaxsockets, sizeof(int), req); + if (error == 0 && req->newptr) { + if (newmaxsockets > maxsockets) { + maxsockets = newmaxsockets; + if (maxsockets > ((maxfiles / 4) * 3)) { + maxfiles = (maxsockets * 5) / 4; + maxfilesperproc = (maxfiles * 9) / 10; + } + EVENTHANDLER_INVOKE(maxsockets_change); + } else + error = EINVAL; + } + return (error); +} +SYSCTL_PROC(_kern_ipc, OID_AUTO, maxsockets, CTLTYPE_INT|CTLFLAG_RW, + &maxsockets, 0, sysctl_maxsockets, "IU", + "Maximum number of sockets avaliable"); SYSCTL_ULONG(_kern_ipc, KIPC_SOCKBUF_WASTE, sockbuf_waste_factor, CTLFLAG_RW, &sb_efficiency, 0, ""); diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 956013a..ee7bcc0 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include #include /* XXX must be before */ +#include #include #include #include @@ -1325,6 +1326,13 @@ next: return (error); } +static void +unp_zone_change(void *tag) +{ + + uma_zone_set_max(unp_zone, maxsockets); +} + void unp_init(void) { @@ -1332,7 +1340,9 @@ unp_init(void) NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); if (unp_zone == NULL) panic("unp_init"); - uma_zone_set_max(unp_zone, nmbclusters); + uma_zone_set_max(unp_zone, maxsockets); + EVENTHANDLER_REGISTER(maxsockets_change, unp_zone_change, + NULL, EVENTHANDLER_PRI_ANY); LIST_INIT(&unp_dhead); LIST_INIT(&unp_shead); TASK_INIT(&unp_gc_task, 0, unp_gc, NULL); diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c index 8cfad6b..2b14f44 100644 --- a/sys/netinet/ip_divert.c +++ b/sys/netinet/ip_divert.c @@ -116,6 +116,13 @@ static u_long div_recvspace = DIVRCVQ; /* XXX sysctl ? */ /* * Initialize divert connection block queue. */ +static void +div_zone_change(void *tag) +{ + + uma_zone_set_max(divcbinfo.ipi_zone, maxsockets); +} + void div_init(void) { @@ -132,6 +139,8 @@ div_init(void) divcbinfo.ipi_zone = uma_zcreate("divcb", sizeof(struct inpcb), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(divcbinfo.ipi_zone, maxsockets); + EVENTHANDLER_REGISTER(maxsockets_change, div_zone_change, + NULL, EVENTHANDLER_PRI_ANY); } /* diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 00667a5..02d2d12 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -167,6 +167,7 @@ static struct mtx ipqlock; #define IPQ_LOCK_ASSERT() mtx_assert(&ipqlock, MA_OWNED) static void maxnipq_update(void); +static void ipq_zone_change(void *); static int maxnipq; /* Administrative limit on # reass queues. */ static int nipq = 0; /* Total # of reass queues */ @@ -256,6 +257,8 @@ ip_init() ipport_tick(NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, ip_fini, NULL, SHUTDOWN_PRI_DEFAULT); + EVENTHANDLER_REGISTER(nmbclusters_change, ipq_zone_change, + NULL, EVENTHANDLER_PRI_ANY); /* Initialize various other remaining things. */ ip_id = time_second & 0xffff; @@ -687,6 +690,16 @@ maxnipq_update(void) uma_zone_set_max(ipq_zone, 1); } +static void +ipq_zone_change(void *tag) +{ + + if (maxnipq > 0 && maxnipq < (nmbclusters / 32)) { + maxnipq = nmbclusters / 32; + maxnipq_update(); + } +} + static int sysctl_maxnipq(SYSCTL_HANDLER_ARGS) { diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 7d6e5b3..7a7890a 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -116,6 +116,13 @@ void (*ip_rsvp_force_done)(struct socket *); /* * Initialize raw connection block q. */ +static void +rip_zone_change(void *tag) +{ + + uma_zone_set_max(ripcbinfo.ipi_zone, maxsockets); +} + void rip_init() { @@ -132,6 +139,8 @@ rip_init() ripcbinfo.ipi_zone = uma_zcreate("ripcb", sizeof(struct inpcb), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(ripcbinfo.ipi_zone, maxsockets); + EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change, + NULL, EVENTHANDLER_PRI_ANY); } static struct sockaddr_in ripsrc = { sizeof(ripsrc), AF_INET }; diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index c31892c..90957ce 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -202,6 +202,14 @@ do { \ (tcp_delack_enabled || (tp->t_flags & TF_NEEDSYN))) /* Initialize TCP reassembly queue */ +static void +tcp_reass_zone_change(void *tag) +{ + + tcp_reass_maxseg = nmbclusters / 16; + uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg); +} + uma_zone_t tcp_reass_zone; void tcp_reass_init() @@ -212,6 +220,8 @@ tcp_reass_init() tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg); + EVENTHANDLER_REGISTER(nmbclusters_change, + tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY); } static int diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index c31892c..90957ce 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -202,6 +202,14 @@ do { \ (tcp_delack_enabled || (tp->t_flags & TF_NEEDSYN))) /* Initialize TCP reassembly queue */ +static void +tcp_reass_zone_change(void *tag) +{ + + tcp_reass_maxseg = nmbclusters / 16; + uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg); +} + uma_zone_t tcp_reass_zone; void tcp_reass_init() @@ -212,6 +220,8 @@ tcp_reass_init() tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(tcp_reass_zone, tcp_reass_maxseg); + EVENTHANDLER_REGISTER(nmbclusters_change, + tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY); } static int diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index a6e6ab8..92da5c5 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -248,6 +248,15 @@ struct callout isn_callout; /* * TCP initialization. */ +static void +tcp_zone_change(void *tag) +{ + + uma_zone_set_max(tcbinfo.ipi_zone, maxsockets); + uma_zone_set_max(tcpcb_zone, maxsockets); + uma_zone_set_max(tcptw_zone, maxsockets / 5); +} + void tcp_init(void) { @@ -310,6 +319,8 @@ tcp_init(void) SHUTDOWN_PRI_DEFAULT); sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + EVENTHANDLER_REGISTER(maxsockets_change, tcp_zone_change, NULL, + EVENTHANDLER_PRI_ANY); } void diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index a6e6ab8..92da5c5 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -248,6 +248,15 @@ struct callout isn_callout; /* * TCP initialization. */ +static void +tcp_zone_change(void *tag) +{ + + uma_zone_set_max(tcbinfo.ipi_zone, maxsockets); + uma_zone_set_max(tcpcb_zone, maxsockets); + uma_zone_set_max(tcptw_zone, maxsockets / 5); +} + void tcp_init(void) { @@ -310,6 +319,8 @@ tcp_init(void) SHUTDOWN_PRI_DEFAULT); sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + EVENTHANDLER_REGISTER(maxsockets_change, tcp_zone_change, NULL, + EVENTHANDLER_PRI_ANY); } void diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index e00892d..fb0b76a 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -129,6 +130,13 @@ static void udp_detach(struct socket *so); static int udp_output(struct inpcb *, struct mbuf *, struct sockaddr *, struct mbuf *, struct thread *); +static void +udp_zone_change(void *tag) +{ + + uma_zone_set_max(udbinfo.ipi_zone, maxsockets); +} + void udp_init() { @@ -141,6 +149,8 @@ udp_init() udbinfo.ipi_zone = uma_zcreate("udpcb", sizeof(struct inpcb), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(udbinfo.ipi_zone, maxsockets); + EVENTHANDLER_REGISTER(maxsockets_change, udp_zone_change, NULL, + EVENTHANDLER_PRI_ANY); } void diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index 18fa214..b3200db 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -87,12 +87,22 @@ static MALLOC_DEFINE(M_FTABLE, "fragment", "fragment reassembly header"); /* * Initialise reassembly queue and fragment identifier. */ +static void +frag6_change(void *tag) +{ + + ip6_maxfragpackets = nmbclusters / 4; + ip6_maxfrags = nmbclusters / 4; +} + void frag6_init() { ip6_maxfragpackets = nmbclusters / 4; ip6_maxfrags = nmbclusters / 4; + EVENTHANDLER_REGISTER(nmbclusters_change, + frag6_change, NULL, EVENTHANDLER_PRI_ANY); IP6Q_LOCK_INIT(); diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h index 83ffc14..804ff03 100644 --- a/sys/sys/eventhandler.h +++ b/sys/sys/eventhandler.h @@ -171,4 +171,7 @@ EVENTHANDLER_DECLARE(process_exit, exitlist_fn); EVENTHANDLER_DECLARE(process_fork, forklist_fn); EVENTHANDLER_DECLARE(process_exec, execlist_fn); +typedef void (*uma_zone_chfn)(void *); +EVENTHANDLER_DECLARE(nmbclusters_change, uma_zone_chfn); +EVENTHANDLER_DECLARE(maxsockets_change, uma_zone_chfn); #endif /* SYS_EVENTHANDLER_H */ -- cgit v1.1