xnu-2050.48.11.tar.gz

[apple/xnu.git] / bsd / dev / unix_startup.c

diff --git a/bsd/dev/unix_startup.c b/bsd/dev/unix_startup.c
index 4ec548794d791ef4b6c2b818e370d82b4e811a8e..a1d8f5200890c20cf367346e9e0cda4bf2c12035 100644 (file)
--- a/bsd/dev/unix_startup.c
+++ b/bsd/dev/unix_startup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2008 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -42,6 +42,7 @@
 #include <sys/file_internal.h>
 #include <sys/proc_internal.h>
 #include <sys/clist.h>
+#include <sys/mcache.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/tty.h>
@@ -50,7 +51,9 @@
 #include <machine/cons.h>
 #include <pexpert/pexpert.h>
 #include <sys/socketvar.h>
+#include <pexpert/pexpert.h>
 
+extern uint32_t kern_maxvnodes;
 extern vm_map_t mb_map;
 
 #if INET || INET6
@@ -62,7 +65,7 @@ void            bsd_bufferinit(void) __attribute__((section("__TEXT, initcode"))
 extern void     md_prepare_for_shutdown(int, int, char *);
 
 unsigned int   bsd_mbuf_cluster_reserve(boolean_t *);
-void bsd_srv_setup(int);
+void bsd_scale_setup(int);
 void bsd_exec_setup(int);
 
 /*
@@ -71,7 +74,7 @@ void bsd_exec_setup(int);
 
 #ifdef NBUF
 int             max_nbuf_headers = NBUF;
-int             niobuf_headers = NBUF / 2;
+int             niobuf_headers = (NBUF / 2) + 2048;
 int            nbuf_hashelements = NBUF;
 int            nbuf_headers = NBUF;
 #else
@@ -81,11 +84,11 @@ int                 nbuf_hashelements = 0;
 int            nbuf_headers = 0;
 #endif
 
-SYSCTL_INT (_kern, OID_AUTO, nbuf, CTLFLAG_RD, &nbuf_headers, 0, "");
-SYSCTL_INT (_kern, OID_AUTO, maxnbuf, CTLFLAG_RW, &max_nbuf_headers, 0, "");
+SYSCTL_INT (_kern, OID_AUTO, nbuf, CTLFLAG_RD | CTLFLAG_LOCKED, &nbuf_headers, 0, "");
+SYSCTL_INT (_kern, OID_AUTO, maxnbuf, CTLFLAG_RW | CTLFLAG_LOCKED, &max_nbuf_headers, 0, "");
 
 __private_extern__ int customnbuf = 0;
-int             srv = 0;       /* Flag indicates a server boot when set */
+int             serverperfmode = 0;    /* Flag indicates a server boot when set */
 int             ncl = 0;
 static unsigned int mbuf_poolsz;
 
@@ -118,10 +121,12 @@ bsd_startupearly(void)
        } else
                nbuf_hashelements = max_nbuf_headers;
 
-       if (niobuf_headers == 0)
-               niobuf_headers = max_nbuf_headers;
-       if (niobuf_headers > 4096)
-               niobuf_headers = 4096;
+       if (niobuf_headers == 0) {
+               if (max_nbuf_headers < 4096)
+                       niobuf_headers = max_nbuf_headers;
+               else
+                       niobuf_headers = (max_nbuf_headers / 2) + 2048;
+       }
        if (niobuf_headers < CONFIG_MIN_NIOBUF)
                niobuf_headers = CONFIG_MIN_NIOBUF;
 
@@ -152,11 +157,7 @@ bsd_startupearly(void)
 
 #if SOCKETS
        {
-#if CONFIG_USESOCKTHRESHOLD
-               static const unsigned int       maxspace = 64 * 1024;
-#else
                static const unsigned int       maxspace = 128 * 1024;
-#endif
                int             scale;
 
                nmbclusters = bsd_mbuf_cluster_reserve(NULL) / MCLBYTES;
@@ -176,18 +177,23 @@ bsd_startupearly(void)
 #endif /* SOCKETS */
 
        if (vnodes_sized == 0) {
-       /*
-        * Size vnodes based on memory 
-        * Number vnodes  is (memsize/64k) + 1024 
-        * This is the calculation that is used by launchd in tiger
-        * we are clipping the max based on 16G 
-        * ie ((16*1024*1024*1024)/(64 *1024)) + 1024 = 263168;
-        * CONFIG_VNODES is set to 263168 for "medium" configurations (the default)
-        * but can be smaller or larger. 
-        */
-       desiredvnodes  = (sane_size/65536) + 1024;
-       if (desiredvnodes > CONFIG_VNODES)
-               desiredvnodes = CONFIG_VNODES;
+               if (!PE_get_default("kern.maxvnodes", &desiredvnodes, sizeof(desiredvnodes))) {
+                       /*
+                        * Size vnodes based on memory 
+                        * Number vnodes  is (memsize/64k) + 1024 
+                        * This is the calculation that is used by launchd in tiger
+                        * we are clipping the max based on 16G 
+                        * ie ((16*1024*1024*1024)/(64 *1024)) + 1024 = 263168;
+                        * CONFIG_VNODES is set to 263168 for "medium" configurations (the default)
+                        * but can be smaller or larger. 
+                        */
+                       desiredvnodes  = (sane_size/65536) + 1024;
+#ifdef CONFIG_VNODES
+                               if (desiredvnodes > CONFIG_VNODES)
+                                       desiredvnodes = CONFIG_VNODES;
+#endif
+               }
+               vnodes_sized = 1;
        }
 }
 
@@ -252,7 +258,6 @@ bsd_mbuf_cluster_reserve(boolean_t *overridden)
         * to correctly compute the size of the low-memory VM pool.  It is
         * redundant but rather harmless.
         */
-       //(void) PE_parse_boot_argn("srv", &srv, sizeof (srv));
        (void) PE_parse_boot_argn("ncl", &ncl, sizeof (ncl));
        (void) PE_parse_boot_argn("mbuf_pool", &mbuf_pool, sizeof (mbuf_pool));
 
@@ -265,12 +270,12 @@ bsd_mbuf_cluster_reserve(boolean_t *overridden)
 
         if (sane_size > (64 * 1024 * 1024) || ncl != 0) {
 
-               if (ncl || srv)
+               if (ncl || serverperfmode)
                        was_overridden = TRUE;
 
                if ((nmbclusters = ncl) == 0) {
                        /* Auto-configure the mbuf pool size */
-                       nmbclusters = mbuf_default_ncl(srv, sane_size);
+                       nmbclusters = mbuf_default_ncl(serverperfmode, sane_size);
                } else {
                        /* Make sure it's not odd in case ncl is manually set */
                        if (nmbclusters & 0x1)
@@ -280,6 +285,9 @@ bsd_mbuf_cluster_reserve(boolean_t *overridden)
                        if (nmbclusters > MAX_NCL)
                                nmbclusters = MAX_NCL;
                }
+
+               /* Round it down to nearest multiple of 4KB clusters */
+               nmbclusters = P2ROUNDDOWN(nmbclusters, NCLPBG);
        }
        mbuf_poolsz = nmbclusters << MCLSHIFT;
 done:
@@ -291,16 +299,19 @@ done:
 #if defined(__LP64__)
 extern int tcp_tcbhashsize;
 extern int max_cached_sock_count;
-void IOSleep(int);
 #endif 
 
 
 void
-bsd_srv_setup(int scale)
+bsd_scale_setup(int scale)
 {
 #if defined(__LP64__)
-       /* if memory is more than 16G, then apply rules for processes */
-       if (scale >  0) {
+       if ((scale > 0) && (serverperfmode == 0)) {
+               maxproc *= scale;
+               maxprocperuid = (maxproc * 2) / 3;
+       }
+       /* Apply server scaling rules */
+       if ((scale >  0) && (serverperfmode !=0)) {
                maxproc = 2500 * scale;
                hard_maxproc = maxproc;
                /* no fp usage */