xnu-1228.12.14.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 daef72f73baabf8d71b5e21ea0f9847c05eac504..1522646eafd573c356f8a16b95a6a2924f7c29db 100644 (file)
--- a/bsd/dev/unix_startup.c
+++ b/bsd/dev/unix_startup.c
@@ -46,13 +46,16 @@
 #include <sys/vnode.h>
 #include <sys/sysctl.h>
 #include <dev/ppc/cons.h>
+#include <pexpert/pexpert.h>
 
 extern vm_map_t mb_map;
 
+#if INET || INET6
 extern u_long   tcp_sendspace;
 extern u_long   tcp_recvspace;
+#endif
 
-void            bsd_bufferinit(void);
+void            bsd_bufferinit(void) __attribute__((section("__TEXT, initcode")));
 extern void     md_prepare_for_shutdown(int, int, char *);
 
 int            bsd_mbuf_cluster_reserve(void);
@@ -63,28 +66,29 @@ int         bsd_mbuf_cluster_reserve(void);
 
 #ifdef NBUF
 int             max_nbuf_headers = NBUF;
-int             niobuf = NBUF / 2;
+int             niobuf_headers = NBUF / 2;
 int            nbuf_hashelements = NBUF;
-int            nbuf = NBUF;
+int            nbuf_headers = NBUF;
 #else
 int             max_nbuf_headers = 0;
-int             niobuf = 0;
+int             niobuf_headers = 0;
 int            nbuf_hashelements = 0;
-int            nbuf = 0;
+int            nbuf_headers = 0;
 #endif
 
-SYSCTL_INT (_kern, OID_AUTO, nbuf, CTLFLAG_RD, &nbuf, 0, "");
+SYSCTL_INT (_kern, OID_AUTO, nbuf, CTLFLAG_RD, &nbuf_headers, 0, "");
 SYSCTL_INT (_kern, OID_AUTO, maxnbuf, CTLFLAG_RW, &max_nbuf_headers, 0, "");
 
 __private_extern__ int customnbuf = 0;
 int             srv = 0;       /* Flag indicates a server boot when set */
 int             ncl = 0;
+static unsigned int mbuf_poolsz;
 
 vm_map_t        buffer_map;
 vm_map_t        bufferhdr_map;
 
 
-extern void     bsd_startupearly(void);
+extern void     bsd_startupearly(void) __attribute__((section("__TEXT, initcode")));
 
 void
 bsd_startupearly(void)
@@ -98,8 +102,8 @@ bsd_startupearly(void)
                max_nbuf_headers = atop(sane_size / 50);        /* Get 2% of ram, but no more than we can map */
        if ((customnbuf == 0) && (max_nbuf_headers > 16384))
                max_nbuf_headers = 16384;
-       if (max_nbuf_headers < 256)
-               max_nbuf_headers = 256;
+       if (max_nbuf_headers < CONFIG_MIN_NBUF)
+               max_nbuf_headers = CONFIG_MIN_NBUF;
 
        /* clip the number of hash elements  to 200000 */
        if ( (customnbuf == 0 ) && nbuf_hashelements == 0) {
@@ -109,14 +113,14 @@ bsd_startupearly(void)
        } else
                nbuf_hashelements = max_nbuf_headers;
 
-       if (niobuf == 0)
-               niobuf = max_nbuf_headers;
-       if (niobuf > 4096)
-               niobuf = 4096;
-       if (niobuf < 128)
-               niobuf = 128;
+       if (niobuf_headers == 0)
+               niobuf_headers = max_nbuf_headers;
+       if (niobuf_headers > 4096)
+               niobuf_headers = 4096;
+       if (niobuf_headers < CONFIG_MIN_NIOBUF)
+               niobuf_headers = CONFIG_MIN_NIOBUF;
 
-       size = (max_nbuf_headers + niobuf) * sizeof(struct buf);
+       size = (max_nbuf_headers + niobuf_headers) * sizeof(struct buf);
        size = round_page(size);
 
        ret = kmem_suballoc(kernel_map,
@@ -138,24 +142,33 @@ bsd_startupearly(void)
        if (ret != KERN_SUCCESS)
                panic("Failed to allocate bufferhdr_map");
 
-       buf = (struct buf *) firstaddr;
-       bzero(buf, size);
+       buf_headers = (struct buf *) firstaddr;
+       bzero(buf_headers, size);
 
+#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() / MCLBYTES;
 
+#if INET || INET6
                if ((scale = nmbclusters / NMBCLUSTERS) > 1) {
                        tcp_sendspace *= scale;
                        tcp_recvspace *= scale;
 
-                       if (tcp_sendspace > (32 * 1024))
-                               tcp_sendspace = 32 * 1024;
-                       if (tcp_recvspace > (32 * 1024))
-                               tcp_recvspace = 32 * 1024;
+                       if (tcp_sendspace > maxspace)
+                               tcp_sendspace = maxspace;
+                       if (tcp_recvspace > maxspace)
+                               tcp_recvspace = maxspace;
                }
+#endif /* INET || INET6 */
        }
+#endif /* SOCKETS */
 
        /*
         * Size vnodes based on memory 
@@ -163,10 +176,12 @@ bsd_startupearly(void)
         * 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 > 263168)
-               desiredvnodes = 263168;
+       if (desiredvnodes > CONFIG_VNODES)
+               desiredvnodes = CONFIG_VNODES;
 }
 
 void
@@ -178,6 +193,7 @@ bsd_bufferinit(void)
 
        bsd_startupearly();
 
+#if SOCKETS
        ret = kmem_suballoc(kernel_map,
                            (vm_offset_t *) & mbutl,
                            (vm_size_t) (nmbclusters * MCLBYTES),
@@ -187,6 +203,7 @@ bsd_bufferinit(void)
 
        if (ret != KERN_SUCCESS)
                panic("Failed to allocate mb_map\n");
+#endif /* SOCKETS */
 
        /*
         * Set up buffers, so they can be used to read disk labels.
@@ -194,6 +211,10 @@ bsd_bufferinit(void)
        bufinit();
 }
 
+/* 512 MB hard limit on size of the mbuf pool */
+#define MAX_MBUF_POOL   (512 << MBSHIFT)
+#define MAX_NCL         (MAX_MBUF_POOL >> MCLSHIFT)
+
 /*
  * this has been broken out into a separate routine that
  * can be called from the x86 early vm initialization to
@@ -204,13 +225,27 @@ bsd_bufferinit(void)
 int
 bsd_mbuf_cluster_reserve(void)
 {
-       if (sane_size > (64 * 1024 * 1024) || ncl) {
+       /* If called more than once, return the previously calculated size */
+        if (mbuf_poolsz != 0)
+                goto done;
 
+       PE_parse_boot_argn("ncl", &ncl, sizeof (ncl));
+
+        if (sane_size > (64 * 1024 * 1024) || ncl) {
                if ((nmbclusters = ncl) == 0) {
                        if ((nmbclusters = ((sane_size / 16)/MCLBYTES)) > 32768)
                                nmbclusters = 32768;
                }
-       }
+               /* Make sure it's not odd in case ncl is manually set */
+               if (nmbclusters & 0x1)
+                       --nmbclusters;
 
+                /* And obey the upper limit */
+                if (nmbclusters > MAX_NCL)
+                       nmbclusters = MAX_NCL;
+
+       }
+       mbuf_poolsz = nmbclusters << MCLSHIFT;
+done:
        return (nmbclusters * MCLBYTES);
 }