X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4c1975fb5e4eccf1012a35081f7e7799b81046..a39ff7e25e19b3a8c3020042a3872ca9ec9659f1:/bsd/dev/unix_startup.c?ds=inline diff --git a/bsd/dev/unix_startup.c b/bsd/dev/unix_startup.c index 4ec548794..a63db5b5f 100644 --- 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-2014 Apple Inc. All rights reserved. * * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,10 @@ #include #include #include +#include +#include +extern uint32_t kern_maxvnodes; extern vm_map_t mb_map; #if INET || INET6 @@ -58,11 +62,10 @@ extern uint32_t tcp_sendspace; extern uint32_t tcp_recvspace; #endif -void bsd_bufferinit(void) __attribute__((section("__TEXT, initcode"))); -extern void md_prepare_for_shutdown(int, int, char *); +void bsd_bufferinit(void); 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,19 +84,22 @@ 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 | CTLFLAG_KERN, &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; + +#if SOCKETS static unsigned int mbuf_poolsz; +#endif vm_map_t buffer_map; vm_map_t bufferhdr_map; static int vnodes_sized = 0; -extern void bsd_startupearly(void) __attribute__((section("__TEXT, initcode"))); +extern void bsd_startupearly(void); void bsd_startupearly(void) @@ -118,10 +124,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; @@ -133,6 +141,8 @@ bsd_startupearly(void) size, FALSE, VM_FLAGS_ANYWHERE, + VM_MAP_KERNEL_FLAGS_NONE, + VM_KERN_MEMORY_FILE, &bufferhdr_map); if (ret != KERN_SUCCESS) @@ -142,7 +152,8 @@ bsd_startupearly(void) &firstaddr, size, 0, - KMA_HERE | KMA_KOBJECT); + KMA_HERE | KMA_KOBJECT, + VM_KERN_MEMORY_FILE); if (ret != KERN_SUCCESS) panic("Failed to allocate bufferhdr_map"); @@ -152,11 +163,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,26 +183,32 @@ 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; } } void bsd_bufferinit(void) { +#if SOCKETS kern_return_t ret; - +#endif /* * Note: Console device initialized in kminit() from bsd_autoconf() * prior to call to us in bsd_init(). @@ -205,10 +218,12 @@ bsd_bufferinit(void) #if SOCKETS ret = kmem_suballoc(kernel_map, - (vm_offset_t *) & mbutl, + (vm_offset_t *) &mbutl, (vm_size_t) (nmbclusters * MCLBYTES), FALSE, VM_FLAGS_ANYWHERE, + VM_MAP_KERNEL_FLAGS_NONE, + VM_KERN_MEMORY_MBUF, &mb_map); if (ret != KERN_SUCCESS) @@ -229,6 +244,7 @@ bsd_bufferinit(void) #endif /* !__LP64__ */ #define MAX_NCL (MAX_MBUF_POOL >> MCLSHIFT) +#if SOCKETS /* * this has been broken out into a separate routine that * can be called from the x86 early vm initialization to @@ -252,7 +268,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 +280,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 +295,9 @@ bsd_mbuf_cluster_reserve(boolean_t *overridden) if (nmbclusters > MAX_NCL) nmbclusters = MAX_NCL; } + + /* Round it down to nearest multiple of PAGE_SIZE */ + nmbclusters = P2ROUNDDOWN(nmbclusters, NCLPG); } mbuf_poolsz = nmbclusters << MCLSHIFT; done: @@ -288,19 +306,28 @@ done: return (mbuf_poolsz); } +#endif + #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; + if (scale > 2) { + maxfiles *= scale; + maxfilesperproc = maxfiles/2; + } + } + /* Apply server scaling rules */ + if ((scale > 0) && (serverperfmode !=0)) { maxproc = 2500 * scale; hard_maxproc = maxproc; /* no fp usage */ @@ -309,16 +336,20 @@ bsd_srv_setup(int scale) maxfilesperproc = maxfiles/2; desiredvnodes = maxfiles; vnodes_sized = 1; + tcp_tfo_backlog = 100 * scale; if (scale > 4) { - /* clip them at 32G level */ + /* clip somaxconn at 32G level */ somaxconn = 2048; - /* 64G or more the hash size is 32k */ + /* + * For scale > 4 (> 32G), clip + * tcp_tcbhashsize to 32K + */ + tcp_tcbhashsize = 32 *1024; + if (scale > 7) { /* clip at 64G level */ - tcp_tcbhashsize = 16 *1024; max_cached_sock_count = 165000; } else { - tcp_tcbhashsize = 32 *1024; max_cached_sock_count = 60000 + ((scale-1) * 15000); } } else { @@ -327,6 +358,10 @@ bsd_srv_setup(int scale) max_cached_sock_count = 60000 + ((scale-1) * 15000); } } + + if(maxproc > hard_maxproc) { + hard_maxproc = maxproc; + } #endif bsd_exec_setup(scale); }