X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/fe8ab488e9161c46dd9885d58fc52996dc0249ff..a39ff7e25e19b3a8c3020042a3872ca9ec9659f1:/bsd/dev/unix_startup.c?ds=inline diff --git a/bsd/dev/unix_startup.c b/bsd/dev/unix_startup.c index ddb2baa68..a63db5b5f 100644 --- a/bsd/dev/unix_startup.c +++ b/bsd/dev/unix_startup.c @@ -52,6 +52,7 @@ #include #include #include +#include extern uint32_t kern_maxvnodes; extern vm_map_t mb_map; @@ -62,7 +63,6 @@ extern uint32_t tcp_recvspace; #endif void bsd_bufferinit(void); -extern void md_prepare_for_shutdown(int, int, char *); unsigned int bsd_mbuf_cluster_reserve(boolean_t *); void bsd_scale_setup(int); @@ -85,7 +85,7 @@ int nbuf_headers = 0; #endif 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, ""); +SYSCTL_INT (_kern, OID_AUTO, maxnbuf, CTLFLAG_RW | CTLFLAG_LOCKED | CTLFLAG_KERN, &max_nbuf_headers, 0, ""); __private_extern__ int customnbuf = 0; int serverperfmode = 0; /* Flag indicates a server boot when set */ @@ -141,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) @@ -150,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"); @@ -215,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) @@ -291,8 +296,8 @@ bsd_mbuf_cluster_reserve(boolean_t *overridden) nmbclusters = MAX_NCL; } - /* Round it down to nearest multiple of 4KB clusters */ - nmbclusters = P2ROUNDDOWN(nmbclusters, NCLPBG); + /* Round it down to nearest multiple of PAGE_SIZE */ + nmbclusters = P2ROUNDDOWN(nmbclusters, NCLPG); } mbuf_poolsz = nmbclusters << MCLSHIFT; done: @@ -316,6 +321,10 @@ bsd_scale_setup(int scale) 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)) { @@ -327,15 +336,16 @@ bsd_scale_setup(int scale) maxfilesperproc = maxfiles/2; desiredvnodes = maxfiles; vnodes_sized = 1; + tcp_tfo_backlog = 100 * scale; if (scale > 4) { /* clip somaxconn at 32G level */ somaxconn = 2048; - /* - * For scale > 4 (> 32G), clip + /* + * For scale > 4 (> 32G), clip * tcp_tcbhashsize to 32K */ tcp_tcbhashsize = 32 *1024; - + if (scale > 7) { /* clip at 64G level */ max_cached_sock_count = 165000; @@ -348,6 +358,10 @@ bsd_scale_setup(int scale) max_cached_sock_count = 60000 + ((scale-1) * 15000); } } + + if(maxproc > hard_maxproc) { + hard_maxproc = maxproc; + } #endif bsd_exec_setup(scale); }