xnu-6153.121.1.tar.gz

[apple/xnu.git] / bsd / kern / bsd_init.c

diff --git a/bsd/kern/bsd_init.c b/bsd/kern/bsd_init.c
index f36d6d4ceac344d0e8edbc5ff30440c8814a05fc..887cb454b7bfe5b23b1e83d1b942956f30257196 100644 (file)
--- a/bsd/kern/bsd_init.c
+++ b/bsd/kern/bsd_init.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000-2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2019 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,9 +22,9 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

- * 
+ *

  *
  * Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
  *     The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989, 1991, 1992, 1993
  *     The Regents of the University of California.  All rights reserved.


@@ -65,7 +65,7 @@
  *     @(#)init_main.c 8.16 (Berkeley) 5/14/95
  */
 
  *     @(#)init_main.c 8.16 (Berkeley) 5/14/95
  */
 

-/* 
+/*

  *
  * Mach Operating System
  * Copyright (c) 1987 Carnegie-Mellon University
  *
  * Mach Operating System
  * Copyright (c) 1987 Carnegie-Mellon University


@@ -94,6 +94,7 @@
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/mman.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/mman.h>

+#include <sys/kasl.h>

 
 #include <security/audit/audit.h>
 
 
 #include <security/audit/audit.h>
 


@@ -106,18 +107,18 @@
 #include <kern/task.h>
 #include <kern/ast.h>
 #include <kern/kalloc.h>
 #include <kern/task.h>
 #include <kern/ast.h>
 #include <kern/kalloc.h>

+#include <kern/ux_handler.h>            /* for ux_handler_setup() */

 
 #include <mach/vm_param.h>
 
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
 
 #include <mach/vm_param.h>
 
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 

-#include <sys/ux_exception.h>  /* for ux_exception_port */
-

 #include <sys/reboot.h>
 #include <sys/reboot.h>

-#include <mach/exception_types.h>
-#include <dev/busvar.h>                        /* for pseudo_inits */
+#include <dev/busvar.h>                 /* for pseudo_inits */

 #include <sys/kdebug.h>
 #include <sys/kdebug.h>

+#include <sys/monotonic.h>
+#include <sys/reason.h>

 
 #include <mach/mach_types.h>
 #include <mach/vm_prot.h>
 
 #include <mach/mach_types.h>
 #include <mach/vm_prot.h>


@@ -125,43 +126,64 @@
 #include <mach/sync_policy.h>
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 #include <mach/sync_policy.h>
 #include <kern/clock.h>
 #include <mach/kern_return.h>

-#include <mach/thread_act.h>           /* for thread_resume() */
-#include <mach/task.h>                 /* for task_set_exception_ports() */
-#include <sys/ux_exception.h>          /* for ux_handler() */
-#include <sys/ubc_internal.h>          /* for ubc_init() */
-#include <sys/mcache.h>                        /* for mcache_init() */
-#include <sys/mbuf.h>                  /* for mbinit() */
-#include <sys/event.h>                 /* for knote_init() */
-#include <sys/aio_kern.h>              /* for aio_init() */
-#include <sys/semaphore.h>             /* for psem_cache_init() */
-#include <net/dlil.h>                  /* for dlil_init() */
-#include <net/kpi_protocol.h>          /* for proto_kpi_init() */
-#include <sys/pipe.h>                  /* for pipeinit() */
-#include <sys/socketvar.h>             /* for socketinit() */
-#include <sys/protosw.h>               /* for domaininit() */
-#include <kern/sched_prim.h>           /* for thread_wakeup() */
-#include <net/if_ether.h>              /* for ether_family_init() */
-#include <vm/vm_protos.h>              /* for vnode_pager_bootstrap() */
-#include <miscfs/devfs/devfsdefs.h>    /* for devfs_kernel_mount() */
-#include <mach/host_priv.h>            /* for host_set_exception_ports() */
-#include <kern/host.h>                 /* for host_priv_self() */
-#include <vm/vm_kern.h>                        /* for kmem_suballoc() */
-#include <sys/semaphore.h>             /* for psem_lock_init() */
-#include <sys/msgbuf.h>                        /* for log_setsize() */
-#include <sys/tty.h>                   /* for tty_init() */
-#include <net/if_utun.h>               /* for utun_register_control() */
-#include <net/net_str_id.h>            /* for net_str_id_init() */
+#include <mach/thread_act.h>            /* for thread_resume() */
+#include <sys/ubc_internal.h>           /* for ubc_init() */
+#include <sys/mcache.h>                 /* for mcache_init() */
+#include <sys/mbuf.h>                   /* for mbinit() */
+#include <sys/event.h>                  /* for knote_init() */
+#include <sys/eventhandler.h>           /* for eventhandler_init() */
+#include <sys/kern_memorystatus.h>      /* for memorystatus_init() */
+#include <sys/kern_memorystatus_freeze.h> /* for memorystatus_freeze_init() */
+#include <sys/aio_kern.h>               /* for aio_init() */
+#include <sys/semaphore.h>              /* for psem_cache_init() */
+#include <net/dlil.h>                   /* for dlil_init() */
+#include <net/kpi_protocol.h>           /* for proto_kpi_init() */
+#include <net/iptap.h>                  /* for iptap_init() */
+#include <sys/pipe.h>                   /* for pipeinit() */
+#include <sys/socketvar.h>              /* for socketinit() */
+#include <sys/protosw.h>                /* for domaininit() */
+#include <kern/sched_prim.h>            /* for thread_wakeup() */
+#include <net/if_ether.h>               /* for ether_family_init() */
+#include <net/if_gif.h>                 /* for gif_init() */
+#include <vm/vm_protos.h>               /* for vnode_pager_bootstrap() */
+#include <miscfs/devfs/devfsdefs.h>     /* for devfs_kernel_mount() */
+#include <vm/vm_kern.h>                 /* for kmem_suballoc() */
+#include <sys/semaphore.h>              /* for psem_lock_init() */
+#include <sys/msgbuf.h>                 /* for log_setsize() */
+#include <sys/tty.h>                    /* for tty_init() */
+#include <sys/proc_uuid_policy.h>       /* proc_uuid_policy_init() */
+#include <netinet/flow_divert.h>        /* flow_divert_init() */
+#include <net/content_filter.h>         /* for cfil_init() */
+#include <net/necp.h>                   /* for necp_init() */
+#include <net/network_agent.h>          /* for netagent_init() */
+#include <net/packet_mangler.h>         /* for pkt_mnglr_init() */
+#include <net/if_utun.h>                /* for utun_register_control() */
+#include <net/if_ipsec.h>               /* for ipsec_register_control() */
+#include <net/net_str_id.h>             /* for net_str_id_init() */
+#include <net/netsrc.h>                 /* for netsrc_init() */
+#include <net/ntstat.h>                 /* for nstat_init() */
+#include <netinet/tcp_cc.h>                     /* for tcp_cc_init() */
+#include <netinet/mptcp_var.h>          /* for mptcp_control_register() */
+#include <net/nwk_wq.h>                 /* for nwk_wq_init */
+#include <net/restricted_in_port.h> /* for restricted_in_port_init() */
+#include <kern/assert.h>                /* for assert() */
+#include <sys/kern_overrides.h>         /* for init_system_override() */
+#include <sys/lockf.h>                  /* for lf_init() */

 
 #include <net/init.h>
 
 #if CONFIG_MACF
 #include <security/mac_framework.h>
 
 #include <net/init.h>
 
 #if CONFIG_MACF
 #include <security/mac_framework.h>

-#include <security/mac_internal.h>     /* mac_init_bsd() */
-#include <security/mac_mach_internal.h>        /* mac_update_task_label() */
+#include <security/mac_internal.h>      /* mac_init_bsd() */
+#include <security/mac_mach_internal.h> /* mac_update_task_label() */

 #endif
 
 #include <machine/exec.h>
 
 #endif
 
 #include <machine/exec.h>
 

+#if CONFIG_NETBOOT
+#include <sys/netboot.h>
+#endif
+

 #if CONFIG_IMAGEBOOT
 #include <sys/imageboot.h>
 #endif
 #if CONFIG_IMAGEBOOT
 #include <sys/imageboot.h>
 #endif


@@ -170,31 +192,33 @@
 #include <net/if_pflog.h>
 #endif
 
 #include <net/if_pflog.h>
 #endif
 

+

 #include <pexpert/pexpert.h>
 #include <pexpert/pexpert.h>

+#include <machine/pal_routines.h>
+#include <console/video_console.h>

 
 

-#if CONFIG_EMBEDDED
-#include <libkern/OSKextLib.h>
+#if CONFIG_XNUPOST
+#include <tests/xnupost.h>

 #endif
 
 #endif
 

-void * get_user_regs(thread_t);                /* XXX kludge for <machine/thread.h> */
-void IOKitInitializeTime(void);                /* XXX */
-void IOSleep(unsigned int);            /* XXX */
-void loopattach(void);                 /* XXX */
-void vc_progress_set(boolean_t, uint32_t); /* XXX */
+void * get_user_regs(thread_t);         /* XXX kludge for <machine/thread.h> */
+void IOKitInitializeTime(void);         /* XXX */
+void IOSleep(unsigned int);             /* XXX */
+void loopattach(void);                  /* XXX */

 
 const char    copyright[] =
 
 const char    copyright[] =

-"Copyright (c) 1982, 1986, 1989, 1991, 1993\n\t"
-"The Regents of the University of California. "
-"All rights reserved.\n\n";
+    "Copyright (c) 1982, 1986, 1989, 1991, 1993\n\t"
+    "The Regents of the University of California. "
+    "All rights reserved.\n\n";

 
 /* Components of the first process -- never freed. */
 
 /* Components of the first process -- never freed. */

-struct proc proc0;
-struct session session0;
-struct pgrp pgrp0;
-struct filedesc filedesc0;
-struct plimit limit0;
-struct pstats pstats0;
-struct sigacts sigacts0;
+struct  proc proc0;
+struct  session session0;
+struct  pgrp pgrp0;
+struct  filedesc filedesc0;
+struct  plimit limit0;
+struct  pstats pstats0;
+struct  sigacts sigacts0;

 proc_t kernproc;
 proc_t initproc;
 
 proc_t kernproc;
 proc_t initproc;
 


@@ -210,80 +234,123 @@ int nswapmap;
 void *swapmap;
 struct swdevt swdevt[1];
 
 void *swapmap;
 struct swdevt swdevt[1];
 

-dev_t  rootdev;                /* device of the root */
-dev_t  dumpdev;                /* device to take dumps on */
-long   dumplo;                 /* offset into dumpdev */
-long   hostid;
-char   hostname[MAXHOSTNAMELEN];
-int            hostnamelen;
-char   domainname[MAXDOMNAMELEN];
-int            domainnamelen;
-#if defined(__i386__) || defined(__x86_64__)
-struct exec_archhandler exec_archhandler_ppc = {
-       .path = "/usr/libexec/oah/translate",
-};
-const char * const kRosettaStandIn_str = "/usr/libexec/oah/RosettaNonGrata";
-#else /* __i386__ */
-struct exec_archhandler exec_archhandler_ppc;
-#endif /* __i386__ */
-
-char rootdevice[16];   /* hfs device names have at least 9 chars */
+dev_t   rootdev;                /* device of the root */
+dev_t   dumpdev;                /* device to take dumps on */
+long    dumplo;                 /* offset into dumpdev */
+long    hostid;
+char    hostname[MAXHOSTNAMELEN];
+lck_mtx_t hostname_lock;
+lck_grp_t *hostname_lck_grp;
+char    domainname[MAXDOMNAMELEN];
+lck_mtx_t domainname_lock;
+
+char rootdevice[DEVMAXNAMESIZE];

 
 #if  KMEMSTATS
 
 #if  KMEMSTATS

-struct kmemstats kmemstats[M_LAST];
+struct  kmemstats kmemstats[M_LAST];
+#endif
+
+struct  vnode *rootvp;
+int boothowto;
+int minimalboot = 0;
+#if CONFIG_EMBEDDED
+int darkboot = 0;

 #endif
 
 #endif
 

-int    lbolt;                          /* awoken once a second */
-struct vnode *rootvp;
-int boothowto = RB_DEBUG;
+#if __arm64__
+int legacy_footprint_entitlement_mode = LEGACY_FOOTPRINT_ENTITLEMENT_IGNORE;
+#endif /* __arm64__ */
+
+#if PROC_REF_DEBUG
+__private_extern__ int proc_ref_tracking_disabled = 0; /* disable panics on leaked proc refs across syscall boundary */
+#endif
+
+#if OS_REASON_DEBUG
+__private_extern__ int os_reason_debug_disabled = 0; /* disable asserts for when we fail to allocate OS reasons */
+#endif

 
 

-void lightning_bolt(void *);

 extern kern_return_t IOFindBSDRoot(char *, unsigned int, dev_t *, u_int32_t *);
 extern void IOSecureBSDRoot(const char * rootName);
 extern kern_return_t IOKitBSDInit(void );
 extern void kminit(void);
 extern kern_return_t IOFindBSDRoot(char *, unsigned int, dev_t *, u_int32_t *);
 extern void IOSecureBSDRoot(const char * rootName);
 extern kern_return_t IOKitBSDInit(void );
 extern void kminit(void);

-extern void klogwakeup(void);

 extern void file_lock_init(void);
 extern void kmeminit(void);
 extern void bsd_bufferinit(void);
 extern void file_lock_init(void);
 extern void kmeminit(void);
 extern void bsd_bufferinit(void);

+extern void oslog_setsize(int size);
+extern void throttle_init(void);
+extern void acct_init(void);

 
 

-extern int srv;
+#if CONFIG_LOCKERBOOT
+#define LOCKER_PROTOBOOT_MOUNT "/protoboot"
+
+const char kernel_protoboot_mount[] = LOCKER_PROTOBOOT_MOUNT;
+extern int mount_locker_protoboot(const char *fsname, const char *mntpoint,
+    const char *pbdevpath);
+#endif
+
+extern int serverperfmode;

 extern int ncl;
 extern int ncl;

+#if DEVELOPMENT || DEBUG
+extern int syscallfilter_disable;
+#endif // DEVELOPMENT || DEBUG

 
 

-vm_map_t       bsd_pageable_map;
-vm_map_t       mb_map;
+vm_map_t        bsd_pageable_map;
+vm_map_t        mb_map;

 
 

-static  int bsd_simul_execs = BSD_SIMUL_EXECS;
-static int bsd_pageable_map_size = BSD_PAGABLE_MAP_SIZE;
-__private_extern__ int execargs_cache_size = BSD_SIMUL_EXECS;
-__private_extern__ int execargs_free_count = BSD_SIMUL_EXECS;
+static  int bsd_simul_execs;
+static int bsd_pageable_map_size;
+__private_extern__ int execargs_cache_size = 0;
+__private_extern__ int execargs_free_count = 0;

 __private_extern__ vm_offset_t * execargs_cache = NULL;
 
 void bsd_exec_setup(int);
 
 __private_extern__ vm_offset_t * execargs_cache = NULL;
 
 void bsd_exec_setup(int);
 

+__private_extern__ int bootarg_execfailurereports = 0;
+
+#if __x86_64__
+__private_extern__ int bootarg_no32exec = 1;
+#endif
+__private_extern__ int bootarg_vnode_cache_defeat = 0;
+
+#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
+__private_extern__ int bootarg_no_vnode_jetsam = 0;
+#endif /* CONFIG_JETSAM && (DEVELOPMENT || DEBUG) */
+
+__private_extern__ int bootarg_no_vnode_drain = 0;
+
+/*
+ * Prevent kernel-based ASLR from being used, for testing.
+ */
+#if DEVELOPMENT || DEBUG
+__private_extern__ int bootarg_disable_aslr = 0;
+#endif
+

 /*
 /*

- * Set to disable grading 64 bit Mach-o binaries as executable, for testing;
- * Intel only.
+ * Allow an alternate dyld to be used for testing.

  */
  */

-__private_extern__ int bootarg_no64exec = 0;

 
 

-int    cmask = CMASK;
+#if DEVELOPMENT || DEBUG
+char dyld_alt_path[MAXPATHLEN];
+int use_alt_dyld = 0;
+extern uint64_t dyld_flags;
+#endif
+
+int     cmask = CMASK;

 extern int customnbuf;
 
 extern int customnbuf;
 

-void bsd_init(void) __attribute__((section("__TEXT, initcode")));
-kern_return_t bsd_autoconf(void) __attribute__((section("__TEXT, initcode")));
-void bsd_utaskbootstrap(void) __attribute__((section("__TEXT, initcode")));
+kern_return_t bsd_autoconf(void);
+void bsd_utaskbootstrap(void);

 
 static void parse_bsd_args(void);
 
 static void parse_bsd_args(void);

-extern task_t bsd_init_task;
-extern char    init_task_failure_data[];
+#if CONFIG_DEV_KMEM
+extern void dev_kmem_init(void);
+#endif

 extern void time_zone_slock_init(void);
 extern void time_zone_slock_init(void);

+extern void select_waitq_init(void);

 static void process_name(const char *, proc_t);
 
 static void setconf(void);
 
 static void process_name(const char *, proc_t);
 
 static void setconf(void);
 

-funnel_t *kernel_flock;
-

 #if SYSV_SHM
 extern void sysv_shm_lock_init(void);
 #endif
 #if SYSV_SHM
 extern void sysv_shm_lock_init(void);
 #endif


@@ -293,27 +360,23 @@ extern void sysv_sem_lock_init(void);
 #if SYSV_MSG
 extern void sysv_msg_lock_init(void);
 #endif
 #if SYSV_MSG
 extern void sysv_msg_lock_init(void);
 #endif

-extern void pthread_init(void);
-
-/* kmem access not enabled by default; can be changed with boot-args */
-int setup_kmem = 0;

 
 

-/* size of kernel trace buffer, disabled by default */
-unsigned int new_nkdbufs = 0;
+extern void ulock_initialize(void);

 
 

-/* mach leak logging */
-int log_leaks = 0;
-int turn_on_log_leaks = 0;
-
-extern void stackshot_lock_init(void);
+#if CONFIG_MACF
+#if defined (__i386__) || defined (__x86_64__)
+/* MACF policy_check configuration flags; see policy_check.c for details */
+int policy_check_flags = 0;

 
 

+extern int check_policy_init(int);
+#endif
+#endif  /* CONFIG_MACF */

 
 /* If we are using CONFIG_DTRACE */
 #if CONFIG_DTRACE
 
 /* If we are using CONFIG_DTRACE */
 #if CONFIG_DTRACE

-       extern void dtrace_postinit(void);
+extern void dtrace_postinit(void);

 #endif
 
 #endif
 

-

 /*
  * Initialization code.
  * Called from cold start routine as
 /*
  * Initialization code.
  * Called from cold start routine as


@@ -332,39 +395,54 @@ extern void stackshot_lock_init(void);
 static void
 process_name(const char *s, proc_t p)
 {
 static void
 process_name(const char *s, proc_t p)
 {

-       size_t length = strlen(s);
-
-       bcopy(s, p->p_comm,
-               length >= sizeof(p->p_comm) ? sizeof(p->p_comm) :
-                       length + 1);
+       strlcpy(p->p_comm, s, sizeof(p->p_comm));
+       strlcpy(p->p_name, s, sizeof(p->p_name));

 }
 
 /* To allow these values to be patched, they're globals here */
 #include <machine/vmparam.h>
 }
 
 /* To allow these values to be patched, they're globals here */
 #include <machine/vmparam.h>

-struct rlimit vm_initial_limit_stack = { DFLSSIZ, MAXSSIZ - PAGE_SIZE };
-struct rlimit vm_initial_limit_data = { DFLDSIZ, MAXDSIZ };
-struct rlimit vm_initial_limit_core = { DFLCSIZ, MAXCSIZ };
+struct rlimit vm_initial_limit_stack = { .rlim_cur = DFLSSIZ, .rlim_max = MAXSSIZ - PAGE_MAX_SIZE };
+struct rlimit vm_initial_limit_data = { .rlim_cur = DFLDSIZ, .rlim_max = MAXDSIZ };
+struct rlimit vm_initial_limit_core = { .rlim_cur = DFLCSIZ, .rlim_max = MAXCSIZ };

 
 

-extern thread_t        cloneproc(task_t, proc_t, int);
-extern int     (*mountroot)(void);
-extern int     netboot_mountroot(void);        /* netboot.c */
-extern int     netboot_setup(void);
+extern thread_t cloneproc(task_t, coalition_t, proc_t, int, int);
+extern int      (*mountroot)(void);

 
 lck_grp_t * proc_lck_grp;
 lck_grp_t * proc_slock_grp;
 lck_grp_t * proc_fdmlock_grp;
 
 lck_grp_t * proc_lck_grp;
 lck_grp_t * proc_slock_grp;
 lck_grp_t * proc_fdmlock_grp;

+lck_grp_t * proc_kqhashlock_grp;
+lck_grp_t * proc_knhashlock_grp;
+lck_grp_t * proc_ucred_mlock_grp;

 lck_grp_t * proc_mlock_grp;
 lck_grp_t * proc_mlock_grp;

+lck_grp_t * proc_dirslock_grp;

 lck_grp_attr_t * proc_lck_grp_attr;
 lck_attr_t * proc_lck_attr;
 lck_mtx_t * proc_list_mlock;
 lck_mtx_t * proc_klist_mlock;
 
 lck_grp_attr_t * proc_lck_grp_attr;
 lck_attr_t * proc_lck_attr;
 lck_mtx_t * proc_list_mlock;
 lck_mtx_t * proc_klist_mlock;
 

+#if CONFIG_XNUPOST
+lck_grp_t * sysctl_debug_test_stackshot_owner_grp;
+lck_mtx_t * sysctl_debug_test_stackshot_owner_init_mtx;
+#endif /* !CONFIG_XNUPOST */
+

 extern lck_mtx_t * execargs_cache_lock;
 
 /* hook called after root is mounted XXX temporary hack */
 void (*mountroot_post_hook)(void);
 void (*unmountroot_pre_hook)(void);
 
 extern lck_mtx_t * execargs_cache_lock;
 
 /* hook called after root is mounted XXX temporary hack */
 void (*mountroot_post_hook)(void);
 void (*unmountroot_pre_hook)(void);
 

+/*
+ * This function is called before IOKit initialization, so that globals
+ * like the sysctl tree are initialized before kernel extensions
+ * are started (since they may want to register sysctls
+ */
+void
+bsd_early_init(void)
+{
+       sysctl_early_init();
+}
+

 /*
  * This function is called very early on in the Mach startup, from the
  * function start_kernel_threads() in osfmk/kern/startup.c.  It's called
 /*
  * This function is called very early on in the Mach startup, from the
  * function start_kernel_threads() in osfmk/kern/startup.c.  It's called


@@ -379,33 +457,51 @@ void (*unmountroot_pre_hook)(void);
  * of the uu_context.vc_ucred field so that the uthread structure can be
  * used like any other.
  */
  * of the uu_context.vc_ucred field so that the uthread structure can be
  * used like any other.
  */

+

 void
 bsd_init(void)
 {
        struct uthread *ut;
        unsigned int i;
 void
 bsd_init(void)
 {
        struct uthread *ut;
        unsigned int i;

-#if __i386__ || __x86_64__
-       int error;
-#endif 

        struct vfs_context context;
        struct vfs_context context;

-       kern_return_t   ret;
+       kern_return_t   ret;

        struct ucred temp_cred;
        struct ucred temp_cred;

+       struct posix_cred temp_pcred;
+#if CONFIG_NETBOOT || CONFIG_IMAGEBOOT
+       boolean_t       netboot = FALSE;
+#endif
+#if CONFIG_LOCKERBOOT
+       vnode_t pbvn = NULLVP;
+       mount_t pbmnt = NULL;
+       char *pbdevp = NULL;
+       char pbdevpath[64];
+       char pbfsname[MFSNAMELEN];
+       char *slash_dev = NULL;
+#endif

 
 

-#define bsd_init_kprintf(x...) /* kprintf("bsd_init: " x) */
+#define DEBUG_BSDINIT 0
+
+#if DEBUG_BSDINIT
+#define bsd_init_kprintf(x, ...) kprintf("bsd_init: " x, ## __VA_ARGS__)
+#else
+#define bsd_init_kprintf(x, ...)
+#endif
+
+       throttle_init();

 
 

-       kernel_flock = funnel_alloc(KERNEL_FUNNEL);
-       if (kernel_flock == (funnel_t *)0 ) {
-               panic("bsd_init: Failed to allocate kernel funnel");
-       }
-        

        printf(copyright);
        printf(copyright);

-       
+

        bsd_init_kprintf("calling kmeminit\n");
        kmeminit();
        bsd_init_kprintf("calling kmeminit\n");
        kmeminit();

-       
+

        bsd_init_kprintf("calling parse_bsd_args\n");
        parse_bsd_args();
 
        bsd_init_kprintf("calling parse_bsd_args\n");
        parse_bsd_args();
 

+#if CONFIG_DEV_KMEM
+       bsd_init_kprintf("calling dev_kmem_init\n");
+       dev_kmem_init();
+#endif
+

        /* Initialize kauth subsystem before instancing the first credential */
        bsd_init_kprintf("calling kauth_init\n");
        kauth_init();
        /* Initialize kauth subsystem before instancing the first credential */
        bsd_init_kprintf("calling kauth_init\n");
        kauth_init();


@@ -417,10 +513,10 @@ bsd_init(void)
        /* Initialize the ttys (MUST be before kminit()/bsd_autoconf()!)*/
        tty_init();
 
        /* Initialize the ttys (MUST be before kminit()/bsd_autoconf()!)*/
        tty_init();
 

-       kernproc = &proc0;      /* implicitly bzero'ed */
+       kernproc = &proc0;      /* implicitly bzero'ed */

 
        /* kernel_task->proc = kernproc; */
 
        /* kernel_task->proc = kernproc; */

-       set_bsdtask_info(kernel_task,(void *)kernproc);
+       set_bsdtask_info(kernel_task, (void *)kernproc);

 
        /* give kernproc a name */
        bsd_init_kprintf("calling process_name\n");
 
        /* give kernproc a name */
        bsd_init_kprintf("calling process_name\n");


@@ -428,46 +524,46 @@ bsd_init(void)
 
        /* allocate proc lock group attribute and group */
        bsd_init_kprintf("calling lck_grp_attr_alloc_init\n");
 
        /* allocate proc lock group attribute and group */
        bsd_init_kprintf("calling lck_grp_attr_alloc_init\n");

-       proc_lck_grp_attr= lck_grp_attr_alloc_init();
-
-       proc_lck_grp = lck_grp_alloc_init("proc",  proc_lck_grp_attr);
-#ifndef CONFIG_EMBEDDED
-       proc_slock_grp = lck_grp_alloc_init("proc-slock",  proc_lck_grp_attr);
-       proc_fdmlock_grp = lck_grp_alloc_init("proc-fdmlock",  proc_lck_grp_attr);
-       proc_mlock_grp = lck_grp_alloc_init("proc-mlock",  proc_lck_grp_attr);
-#endif
+       proc_lck_grp_attr = lck_grp_attr_alloc_init();
+
+       proc_lck_grp = lck_grp_alloc_init("proc", proc_lck_grp_attr);
+
+       proc_slock_grp = lck_grp_alloc_init("proc-slock", proc_lck_grp_attr);
+       proc_ucred_mlock_grp = lck_grp_alloc_init("proc-ucred-mlock", proc_lck_grp_attr);
+       proc_mlock_grp = lck_grp_alloc_init("proc-mlock", proc_lck_grp_attr);
+       proc_fdmlock_grp = lck_grp_alloc_init("proc-fdmlock", proc_lck_grp_attr);
+       proc_kqhashlock_grp = lck_grp_alloc_init("proc-kqhashlock", proc_lck_grp_attr);
+       proc_knhashlock_grp = lck_grp_alloc_init("proc-knhashlock", proc_lck_grp_attr);
+       proc_dirslock_grp = lck_grp_alloc_init("proc-dirslock", proc_lck_grp_attr);
+#if CONFIG_XNUPOST
+       sysctl_debug_test_stackshot_owner_grp = lck_grp_alloc_init("test-stackshot-owner-grp", LCK_GRP_ATTR_NULL);
+       sysctl_debug_test_stackshot_owner_init_mtx = lck_mtx_alloc_init(
+               sysctl_debug_test_stackshot_owner_grp,
+               LCK_ATTR_NULL);
+#endif /* !CONFIG_XNUPOST */

        /* Allocate proc lock attribute */
        proc_lck_attr = lck_attr_alloc_init();
        /* Allocate proc lock attribute */
        proc_lck_attr = lck_attr_alloc_init();

-#if 0
-#if __PROC_INTERNAL_DEBUG
-       lck_attr_setdebug(proc_lck_attr);
-#endif
-#endif

 
 

-#ifdef CONFIG_EMBEDDED
-       proc_list_mlock = lck_mtx_alloc_init(proc_lck_grp, proc_lck_attr);
-       proc_klist_mlock = lck_mtx_alloc_init(proc_lck_grp, proc_lck_attr);
-       lck_mtx_init(&kernproc->p_mlock, proc_lck_grp, proc_lck_attr);
-       lck_mtx_init(&kernproc->p_fdmlock, proc_lck_grp, proc_lck_attr);
-       lck_spin_init(&kernproc->p_slock, proc_lck_grp, proc_lck_attr);
-#else  

        proc_list_mlock = lck_mtx_alloc_init(proc_mlock_grp, proc_lck_attr);
        proc_klist_mlock = lck_mtx_alloc_init(proc_mlock_grp, proc_lck_attr);
        lck_mtx_init(&kernproc->p_mlock, proc_mlock_grp, proc_lck_attr);
        lck_mtx_init(&kernproc->p_fdmlock, proc_fdmlock_grp, proc_lck_attr);
        proc_list_mlock = lck_mtx_alloc_init(proc_mlock_grp, proc_lck_attr);
        proc_klist_mlock = lck_mtx_alloc_init(proc_mlock_grp, proc_lck_attr);
        lck_mtx_init(&kernproc->p_mlock, proc_mlock_grp, proc_lck_attr);
        lck_mtx_init(&kernproc->p_fdmlock, proc_fdmlock_grp, proc_lck_attr);

+       lck_mtx_init(&kernproc->p_ucred_mlock, proc_ucred_mlock_grp, proc_lck_attr);

        lck_spin_init(&kernproc->p_slock, proc_slock_grp, proc_lck_attr);
        lck_spin_init(&kernproc->p_slock, proc_slock_grp, proc_lck_attr);

-#endif
+       lck_rw_init(&kernproc->p_dirs_lock, proc_dirslock_grp, proc_lck_attr);

 
 

+       assert(bsd_simul_execs != 0);

        execargs_cache_lock = lck_mtx_alloc_init(proc_lck_grp, proc_lck_attr);
        execargs_cache_size = bsd_simul_execs;
        execargs_free_count = bsd_simul_execs;
        execargs_cache = (vm_offset_t *)kalloc(bsd_simul_execs * sizeof(vm_offset_t));
        bzero(execargs_cache, bsd_simul_execs * sizeof(vm_offset_t));
        execargs_cache_lock = lck_mtx_alloc_init(proc_lck_grp, proc_lck_attr);
        execargs_cache_size = bsd_simul_execs;
        execargs_free_count = bsd_simul_execs;
        execargs_cache = (vm_offset_t *)kalloc(bsd_simul_execs * sizeof(vm_offset_t));
        bzero(execargs_cache, bsd_simul_execs * sizeof(vm_offset_t));

-       
-       if (current_task() != kernel_task)
+
+       if (current_task() != kernel_task) {

                printf("bsd_init: We have a problem, "
                printf("bsd_init: We have a problem, "

-                               "current task is not kernel task\n");
-       
+                   "current task is not kernel task\n");
+       }
+

        bsd_init_kprintf("calling get_bsdthread_info\n");
        ut = (uthread_t)get_bsdthread_info(current_thread());
 
        bsd_init_kprintf("calling get_bsdthread_info\n");
        ut = (uthread_t)get_bsdthread_info(current_thread());
 


@@ -476,9 +572,22 @@ bsd_init(void)
         * Initialize the MAC Framework
         */
        mac_policy_initbsd();
         * Initialize the MAC Framework
         */
        mac_policy_initbsd();

-       kernproc->p_mac_enforce = 0;
+
+#if defined (__i386__) || defined (__x86_64__)
+       /*
+        * We currently only support this on i386/x86_64, as that is the
+        * only lock code we have instrumented so far.
+        */
+       check_policy_init(policy_check_flags);
+#endif

 #endif /* MAC */
 
 #endif /* MAC */
 

+       ulock_initialize();
+
+       hostname_lck_grp = lck_grp_alloc_init("hostname", LCK_GRP_ATTR_NULL);
+       lck_mtx_init(&hostname_lock, hostname_lck_grp, LCK_ATTR_NULL);
+       lck_mtx_init(&domainname_lock, hostname_lck_grp, LCK_ATTR_NULL);
+

        /*
         * Create process 0.
         */
        /*
         * Create process 0.
         */


@@ -487,15 +596,12 @@ bsd_init(void)
        kernproc->p_pgrp = &pgrp0;
        LIST_INSERT_HEAD(PGRPHASH(0), &pgrp0, pg_hash);
        LIST_INIT(&pgrp0.pg_members);
        kernproc->p_pgrp = &pgrp0;
        LIST_INSERT_HEAD(PGRPHASH(0), &pgrp0, pg_hash);
        LIST_INIT(&pgrp0.pg_members);

-#ifdef CONFIG_EMBEDDED
-       lck_mtx_init(&pgrp0.pg_mlock, proc_lck_grp, proc_lck_attr);     
-#else

        lck_mtx_init(&pgrp0.pg_mlock, proc_mlock_grp, proc_lck_attr);
        lck_mtx_init(&pgrp0.pg_mlock, proc_mlock_grp, proc_lck_attr);

-#endif

        /* There is no other bsd thread this point and is safe without pgrp lock */
        LIST_INSERT_HEAD(&pgrp0.pg_members, kernproc, p_pglist);
        kernproc->p_listflag |= P_LIST_INPGRP;
        kernproc->p_pgrpid = 0;
        /* There is no other bsd thread this point and is safe without pgrp lock */
        LIST_INSERT_HEAD(&pgrp0.pg_members, kernproc, p_pglist);
        kernproc->p_listflag |= P_LIST_INPGRP;
        kernproc->p_pgrpid = 0;

+       kernproc->p_uniqueid = 0;

 
        pgrp0.pg_session = &session0;
        pgrp0.pg_membercnt = 1;
 
        pgrp0.pg_session = &session0;
        pgrp0.pg_membercnt = 1;


@@ -503,28 +609,37 @@ bsd_init(void)
        session0.s_count = 1;
        session0.s_leader = kernproc;
        session0.s_listflags = 0;
        session0.s_count = 1;
        session0.s_leader = kernproc;
        session0.s_listflags = 0;

-#ifdef CONFIG_EMBEDDED
-       lck_mtx_init(&session0.s_mlock, proc_lck_grp, proc_lck_attr);
-#else

        lck_mtx_init(&session0.s_mlock, proc_mlock_grp, proc_lck_attr);
        lck_mtx_init(&session0.s_mlock, proc_mlock_grp, proc_lck_attr);

-#endif

        LIST_INSERT_HEAD(SESSHASH(0), &session0, s_hash);
        proc_list_unlock();
 
        LIST_INSERT_HEAD(SESSHASH(0), &session0, s_hash);
        proc_list_unlock();
 

-#if CONFIG_LCTX
-       kernproc->p_lctx = NULL;
+#if CONFIG_PERSONAS
+       kernproc->p_persona = NULL;

 #endif
 
        kernproc->task = kernel_task;
 #endif
 
        kernproc->task = kernel_task;

-       
+

        kernproc->p_stat = SRUN;
        kernproc->p_flag = P_SYSTEM;
        kernproc->p_stat = SRUN;
        kernproc->p_flag = P_SYSTEM;

+       kernproc->p_lflag = 0;
+       kernproc->p_ladvflag = 0;
+
+#if defined(__LP64__)
+       kernproc->p_flag |= P_LP64;
+#endif
+
+#if DEVELOPMENT || DEBUG
+       if (bootarg_disable_aslr) {
+               kernproc->p_flag |= P_DISABLE_ASLR;
+       }
+#endif
+

        kernproc->p_nice = NZERO;
        kernproc->p_pptr = kernproc;
 
        TAILQ_INIT(&kernproc->p_uthlist);
        TAILQ_INSERT_TAIL(&kernproc->p_uthlist, ut, uu_list);
        kernproc->p_nice = NZERO;
        kernproc->p_pptr = kernproc;
 
        TAILQ_INIT(&kernproc->p_uthlist);
        TAILQ_INSERT_TAIL(&kernproc->p_uthlist, ut, uu_list);

-       
+

        kernproc->sigwait = FALSE;
        kernproc->sigwait_thread = THREAD_NULL;
        kernproc->exit_thread = THREAD_NULL;
        kernproc->sigwait = FALSE;
        kernproc->sigwait_thread = THREAD_NULL;
        kernproc->exit_thread = THREAD_NULL;


@@ -535,14 +650,22 @@ bsd_init(void)
         */
        bsd_init_kprintf("calling bzero\n");
        bzero(&temp_cred, sizeof(temp_cred));
         */
        bsd_init_kprintf("calling bzero\n");
        bzero(&temp_cred, sizeof(temp_cred));

-       temp_cred.cr_ngroups = 1;
-
-       temp_cred.cr_audit.as_aia_p = &audit_default_aia;
-        /* XXX the following will go away with cr_au */
-       temp_cred.cr_au.ai_auid = AU_DEFAUDITID;
+       bzero(&temp_pcred, sizeof(temp_pcred));
+       temp_pcred.cr_ngroups = 1;
+       /* kern_proc, shouldn't call up to DS for group membership */
+       temp_pcred.cr_flags = CRF_NOMEMBERD;
+       temp_cred.cr_audit.as_aia_p = audit_default_aia_p;

 
        bsd_init_kprintf("calling kauth_cred_create\n");
 
        bsd_init_kprintf("calling kauth_cred_create\n");

-       kernproc->p_ucred = kauth_cred_create(&temp_cred); 
+       /*
+        * We have to label the temp cred before we create from it to
+        * properly set cr_ngroups, or the create will fail.
+        */
+       posix_cred_label(&temp_cred, &temp_pcred);
+       kernproc->p_ucred = kauth_cred_create(&temp_cred);
+
+       /* update cred on proc */
+       PROC_UPDATE_CREDS_ONPROC(kernproc);

 
        /* give the (already exisiting) initial thread a reference on it */
        bsd_init_kprintf("calling kauth_cred_ref\n");
 
        /* give the (already exisiting) initial thread a reference on it */
        bsd_init_kprintf("calling kauth_cred_ref\n");


@@ -560,23 +683,24 @@ bsd_init(void)
 
 #if CONFIG_MACF
        mac_cred_label_associate_kernel(kernproc->p_ucred);
 
 #if CONFIG_MACF
        mac_cred_label_associate_kernel(kernproc->p_ucred);

-       mac_task_label_update_cred (kernproc->p_ucred, (struct task *) kernproc->task);

 #endif
 
        /* Create the file descriptor table. */
 #endif
 
        /* Create the file descriptor table. */

-       filedesc0.fd_refcnt = 1+1;      /* +1 so shutdown will not _FREE_ZONE */

        kernproc->p_fd = &filedesc0;
        filedesc0.fd_cmask = cmask;
        kernproc->p_fd = &filedesc0;
        filedesc0.fd_cmask = cmask;

-       filedesc0.fd_knlistsize = -1;
+       filedesc0.fd_knlistsize = 0;

        filedesc0.fd_knlist = NULL;
        filedesc0.fd_knhash = NULL;
        filedesc0.fd_knhashmask = 0;
        filedesc0.fd_knlist = NULL;
        filedesc0.fd_knhash = NULL;
        filedesc0.fd_knhashmask = 0;

+       lck_mtx_init(&filedesc0.fd_kqhashlock, proc_kqhashlock_grp, proc_lck_attr);
+       lck_mtx_init(&filedesc0.fd_knhashlock, proc_knhashlock_grp, proc_lck_attr);

 
        /* Create the limits structures. */
        kernproc->p_limit = &limit0;
 
        /* Create the limits structures. */
        kernproc->p_limit = &limit0;

-       for (i = 0; i < sizeof(kernproc->p_rlimit)/sizeof(kernproc->p_rlimit[0]); i++)
-               limit0.pl_rlimit[i].rlim_cur = 
-                       limit0.pl_rlimit[i].rlim_max = RLIM_INFINITY;
+       for (i = 0; i < sizeof(kernproc->p_rlimit) / sizeof(kernproc->p_rlimit[0]); i++) {
+               limit0.pl_rlimit[i].rlim_cur =
+                   limit0.pl_rlimit[i].rlim_max = RLIM_INFINITY;
+       }

        limit0.pl_rlimit[RLIMIT_NOFILE].rlim_cur = NOFILE;
        limit0.pl_rlimit[RLIMIT_NPROC].rlim_cur = maxprocperuid;
        limit0.pl_rlimit[RLIMIT_NPROC].rlim_max = maxproc;
        limit0.pl_rlimit[RLIMIT_NOFILE].rlim_cur = NOFILE;
        limit0.pl_rlimit[RLIMIT_NPROC].rlim_cur = maxprocperuid;
        limit0.pl_rlimit[RLIMIT_NPROC].rlim_max = maxproc;


@@ -589,7 +713,7 @@ bsd_init(void)
        kernproc->p_sigacts = &sigacts0;
 
        /*
        kernproc->p_sigacts = &sigacts0;
 
        /*

-        * Charge root for two  processes: init and mach_init.
+        * Charge root for one process: launchd.

         */
        bsd_init_kprintf("calling chgproccnt\n");
        (void)chgproccnt(0, 1);
         */
        bsd_init_kprintf("calling chgproccnt\n");
        (void)chgproccnt(0, 1);


@@ -599,19 +723,26 @@ bsd_init(void)
         *      for temporary copying (execve()).
         */
        {
         *      for temporary copying (execve()).
         */
        {

-               vm_offset_t     minimum;
+               vm_offset_t     minimum;

 
                bsd_init_kprintf("calling kmem_suballoc\n");
 
                bsd_init_kprintf("calling kmem_suballoc\n");

+               assert(bsd_pageable_map_size != 0);

                ret = kmem_suballoc(kernel_map,
                ret = kmem_suballoc(kernel_map,

-                               &minimum,
-                               (vm_size_t)bsd_pageable_map_size,
-                               TRUE,
-                               VM_FLAGS_ANYWHERE,
-                               &bsd_pageable_map);
-               if (ret != KERN_SUCCESS) 
+                   &minimum,
+                   (vm_size_t)bsd_pageable_map_size,
+                   TRUE,
+                   VM_FLAGS_ANYWHERE,
+                   VM_MAP_KERNEL_FLAGS_NONE,
+                   VM_KERN_MEMORY_BSD,
+                   &bsd_pageable_map);
+               if (ret != KERN_SUCCESS) {

                        panic("bsd_init: Failed to allocate bsd pageable map");
                        panic("bsd_init: Failed to allocate bsd pageable map");

+               }

        }
 
        }
 

+       bsd_init_kprintf("calling fpxlog_init\n");
+       fpxlog_init();
+

        /*
         * Initialize buffers and hash links for buffers
         *
        /*
         * Initialize buffers and hash links for buffers
         *


@@ -622,24 +753,12 @@ bsd_init(void)
        bsd_init_kprintf("calling bsd_bufferinit\n");
        bsd_bufferinit();
 
        bsd_init_kprintf("calling bsd_bufferinit\n");
        bsd_bufferinit();
 

-       /* Initialize the execve() semaphore */
-       bsd_init_kprintf("calling semaphore_create\n");
-
-       if (ret != KERN_SUCCESS)
-               panic("bsd_init: Failed to create execve semaphore");
-

        /*
         * Initialize the calendar.
         */
        bsd_init_kprintf("calling IOKitInitializeTime\n");
        IOKitInitializeTime();
 
        /*
         * Initialize the calendar.
         */
        bsd_init_kprintf("calling IOKitInitializeTime\n");
        IOKitInitializeTime();
 

-       if (turn_on_log_leaks && !new_nkdbufs)
-               new_nkdbufs = 200000;
-       start_kern_tracing(new_nkdbufs);
-       if (turn_on_log_leaks)
-               log_leaks = 1;
-

        bsd_init_kprintf("calling ubc_init\n");
        ubc_init();
 
        bsd_init_kprintf("calling ubc_init\n");
        ubc_init();
 


@@ -647,6 +766,16 @@ bsd_init(void)
        bsd_init_kprintf("calling vfsinit\n");
        vfsinit();
 
        bsd_init_kprintf("calling vfsinit\n");
        vfsinit();
 

+       /* Initialize file locks. */
+       bsd_init_kprintf("calling lf_init\n");
+       lf_init();
+
+#if CONFIG_PROC_UUID_POLICY
+       /* Initial proc_uuid_policy subsystem */
+       bsd_init_kprintf("calling proc_uuid_policy_init()\n");
+       proc_uuid_policy_init();
+#endif
+

 #if SOCKETS
        /* Initialize per-CPU cache allocator */
        mcache_init();
 #if SOCKETS
        /* Initialize per-CPU cache allocator */
        mcache_init();


@@ -655,6 +784,7 @@ bsd_init(void)
        bsd_init_kprintf("calling mbinit\n");
        mbinit();
        net_str_id_init(); /* for mbuf tags */
        bsd_init_kprintf("calling mbinit\n");
        mbinit();
        net_str_id_init(); /* for mbuf tags */

+       restricted_in_port_init();

 #endif /* SOCKETS */
 
        /*
 #endif /* SOCKETS */
 
        /*


@@ -663,18 +793,16 @@ bsd_init(void)
         */
 #if CONFIG_AUDIT
        bsd_init_kprintf("calling audit_init\n");
         */
 #if CONFIG_AUDIT
        bsd_init_kprintf("calling audit_init\n");

-       audit_init();  
+       audit_init();

 #endif
 
        /* Initialize kqueues */
        bsd_init_kprintf("calling knote_init\n");
        knote_init();
 
 #endif
 
        /* Initialize kqueues */
        bsd_init_kprintf("calling knote_init\n");
        knote_init();
 

-#if CONFIG_EMBEDDED
-       /* Initialize kernel memory status notifications */
-       bsd_init_kprintf("calling kern_memorystatus_init\n");
-       kern_memorystatus_init();
-#endif
+       /* Initialize event handler */
+       bsd_init_kprintf("calling eventhandler_init\n");
+       eventhandler_init();

 
        /* Initialize for async IO */
        bsd_init_kprintf("calling aio_init\n");
 
        /* Initialize for async IO */
        bsd_init_kprintf("calling aio_init\n");


@@ -712,18 +840,16 @@ bsd_init(void)
        psem_cache_init();
        bsd_init_kprintf("calling time_zone_slock_init\n");
        time_zone_slock_init();
        psem_cache_init();
        bsd_init_kprintf("calling time_zone_slock_init\n");
        time_zone_slock_init();

+       bsd_init_kprintf("calling select_waitq_init\n");
+       select_waitq_init();

 
 

-       /* Stack snapshot facility lock */
-       stackshot_lock_init();

        /*
         * Initialize protocols.  Block reception of incoming packets
         * until everything is ready.
         */
        /*
         * Initialize protocols.  Block reception of incoming packets
         * until everything is ready.
         */

-       bsd_init_kprintf("calling sysctl_register_fixed\n");
-       sysctl_register_fixed(); 
-       bsd_init_kprintf("calling sysctl_mib_init\n");
-       sysctl_mib_init();

 #if NETWORKING
 #if NETWORKING

+       bsd_init_kprintf("calling nwk_wq_init\n");
+       nwk_wq_init();

        bsd_init_kprintf("calling dlil_init\n");
        dlil_init();
        bsd_init_kprintf("calling proto_kpi_init\n");
        bsd_init_kprintf("calling dlil_init\n");
        dlil_init();
        bsd_init_kprintf("calling proto_kpi_init\n");


@@ -734,23 +860,41 @@ bsd_init(void)
        socketinit();
        bsd_init_kprintf("calling domaininit\n");
        domaininit();
        socketinit();
        bsd_init_kprintf("calling domaininit\n");
        domaininit();

+       iptap_init();
+#if FLOW_DIVERT
+       flow_divert_init();
+#endif  /* FLOW_DIVERT */

 #endif /* SOCKETS */
 #endif /* SOCKETS */

-

        kernproc->p_fd->fd_cdir = NULL;
        kernproc->p_fd->fd_rdir = NULL;
 
        kernproc->p_fd->fd_cdir = NULL;
        kernproc->p_fd->fd_rdir = NULL;
 

-#ifdef GPROF
-       /* Initialize kernel profiling. */
-       kmstartup();
+#if CONFIG_FREEZE
+#ifndef CONFIG_MEMORYSTATUS
+    #error "CONFIG_FREEZE defined without matching CONFIG_MEMORYSTATUS"
+#endif
+       /* Initialise background freezing */
+       bsd_init_kprintf("calling memorystatus_freeze_init\n");
+       memorystatus_freeze_init();

 #endif
 
 #endif
 

-       /* kick off timeout driven events by calling first time */
-       thread_wakeup(&lbolt);
-       timeout(lightning_bolt, 0, hz);
+#if CONFIG_MEMORYSTATUS
+       /* Initialize kernel memory status notifications */
+       bsd_init_kprintf("calling memorystatus_init\n");
+       memorystatus_init();
+#endif /* CONFIG_MEMORYSTATUS */
+
+       bsd_init_kprintf("calling acct_init\n");
+       acct_init();
+
+       bsd_init_kprintf("calling sysctl_mib_init\n");
+       sysctl_mib_init();

 
        bsd_init_kprintf("calling bsd_autoconf\n");
        bsd_autoconf();
 
 
        bsd_init_kprintf("calling bsd_autoconf\n");
        bsd_autoconf();
 

+       bsd_init_kprintf("calling os_reason_init\n");
+       os_reason_init();
+

 #if CONFIG_DTRACE
        dtrace_postinit();
 #endif
 #if CONFIG_DTRACE
        dtrace_postinit();
 #endif


@@ -763,7 +907,11 @@ bsd_init(void)
 #include <loop.h>
 #if NLOOP > 0
        bsd_init_kprintf("calling loopattach\n");
 #include <loop.h>
 #if NLOOP > 0
        bsd_init_kprintf("calling loopattach\n");

-       loopattach();                   /* XXX */
+       loopattach();                   /* XXX */
+#endif
+#if NGIF
+       /* Initialize gif interface (after lo0) */
+       gif_init();

 #endif
 
 #if PFLOG
 #endif
 
 #if PFLOG


@@ -781,85 +929,65 @@ bsd_init(void)
        /* Call any kext code that wants to run just after network init */
        bsd_init_kprintf("calling net_init_run\n");
        net_init_run();
        /* Call any kext code that wants to run just after network init */
        bsd_init_kprintf("calling net_init_run\n");
        net_init_run();

-       
+
+#if CONTENT_FILTER
+       cfil_init();
+#endif
+
+#if PACKET_MANGLER
+       pkt_mnglr_init();
+#endif
+
+#if NECP
+       /* Initialize Network Extension Control Policies */
+       necp_init();
+#endif
+
+       netagent_init();
+

        /* register user tunnel kernel control handler */
        utun_register_control();
        /* register user tunnel kernel control handler */
        utun_register_control();

+#if IPSEC
+       ipsec_register_control();
+#endif /* IPSEC */
+       netsrc_init();
+       nstat_init();
+       tcp_cc_init();
+#if MPTCP
+       mptcp_control_register();
+#endif /* MPTCP */

 #endif /* NETWORKING */
 
        bsd_init_kprintf("calling vnode_pager_bootstrap\n");
        vnode_pager_bootstrap();
 #endif /* NETWORKING */
 
        bsd_init_kprintf("calling vnode_pager_bootstrap\n");
        vnode_pager_bootstrap();

-#if 0
-       /* XXX Hack for early debug stop */
-       printf("\nabout to sleep for 10 seconds\n");
-       IOSleep( 10 * 1000 );
-       /* Debugger("hello"); */
-#endif

 
        bsd_init_kprintf("calling inittodr\n");
        inittodr(0);
 
 
        bsd_init_kprintf("calling inittodr\n");
        inittodr(0);
 

-#if CONFIG_EMBEDDED
-       {
-               /* print out early VM statistics */
-               kern_return_t kr1;
-               vm_statistics_data_t stat;
-               mach_msg_type_number_t count;
-
-               count = HOST_VM_INFO_COUNT;
-               kr1 = host_statistics(host_self(),
-                                     HOST_VM_INFO,
-                                     (host_info_t)&stat,
-                                     &count);
-               kprintf("Mach Virtual Memory Statistics (page size of 4096) bytes\n"
-                       "Pages free:\t\t\t%u.\n"
-                       "Pages active:\t\t\t%u.\n"
-                       "Pages inactive:\t\t\t%u.\n"
-                       "Pages wired down:\t\t%u.\n"
-                       "\"Translation faults\":\t\t%u.\n"
-                       "Pages copy-on-write:\t\t%u.\n"
-                       "Pages zero filled:\t\t%u.\n"
-                       "Pages reactivated:\t\t%u.\n"
-                       "Pageins:\t\t\t%u.\n"
-                       "Pageouts:\t\t\t%u.\n"
-                       "Object cache: %u hits of %u lookups (%d%% hit rate)\n",
-
-                       stat.free_count,
-                       stat.active_count,
-                       stat.inactive_count,
-                       stat.wire_count,
-                       stat.faults,
-                       stat.cow_faults,
-                       stat.zero_fill_count,
-                       stat.reactivations,
-                       stat.pageins,
-                       stat.pageouts,
-                       stat.hits,
-                       stat.lookups,
-                       (stat.hits == 0) ? 100 :
-                                          ((stat.lookups * 100) / stat.hits));
-       }
-#endif /* CONFIG_EMBEDDED */
-       

        /* Mount the root file system. */
        /* Mount the root file system. */

-       while( TRUE) {
+       while (TRUE) {

                int err;
 
                bsd_init_kprintf("calling setconf\n");
                setconf();
                int err;
 
                bsd_init_kprintf("calling setconf\n");
                setconf();

+#if CONFIG_NETBOOT
+               netboot = (mountroot == netboot_mountroot);
+#endif

 
                bsd_init_kprintf("vfs_mountroot\n");
 
                bsd_init_kprintf("vfs_mountroot\n");

-               if (0 == (err = vfs_mountroot()))
+               if (0 == (err = vfs_mountroot())) {

                        break;
                        break;

+               }

                rootdevice[0] = '\0';
                rootdevice[0] = '\0';

-#if NFSCLIENT
-               if (mountroot == netboot_mountroot) {
+#if CONFIG_NETBOOT
+               if (netboot) {

                        PE_display_icon( 0, "noroot");  /* XXX a netboot-specific icon would be nicer */
                        vc_progress_set(FALSE, 0);
                        PE_display_icon( 0, "noroot");  /* XXX a netboot-specific icon would be nicer */
                        vc_progress_set(FALSE, 0);

-                       for (i=1; 1; i*=2) {
+                       for (i = 1; 1; i *= 2) {

                                printf("bsd_init: failed to mount network root, error %d, %s\n",
                                printf("bsd_init: failed to mount network root, error %d, %s\n",

-                                       err, PE_boot_args());
+                                   err, PE_boot_args());

                                printf("We are hanging here...\n");
                                printf("We are hanging here...\n");

-                               IOSleep(i*60*1000);
+                               IOSleep(i * 60 * 1000);

                        }
                        /*NOTREACHED*/
                }
                        }
                        /*NOTREACHED*/
                }


@@ -876,66 +1004,128 @@ bsd_init(void)
 
        bsd_init_kprintf("calling VFS_ROOT\n");
        /* Get the vnode for '/'.  Set fdp->fd_fd.fd_cdir to reference it. */
 
        bsd_init_kprintf("calling VFS_ROOT\n");
        /* Get the vnode for '/'.  Set fdp->fd_fd.fd_cdir to reference it. */

-       if (VFS_ROOT(mountlist.tqh_first, &rootvnode, &context))
+       if (VFS_ROOT(mountlist.tqh_first, &rootvnode, &context)) {

                panic("bsd_init: cannot find root vnode: %s", PE_boot_args());
                panic("bsd_init: cannot find root vnode: %s", PE_boot_args());

+       }

        rootvnode->v_flag |= VROOT;
        (void)vnode_ref(rootvnode);
        (void)vnode_put(rootvnode);
        filedesc0.fd_cdir = rootvnode;
 
        rootvnode->v_flag |= VROOT;
        (void)vnode_ref(rootvnode);
        (void)vnode_put(rootvnode);
        filedesc0.fd_cdir = rootvnode;
 

-#if NFSCLIENT
-       if (mountroot == netboot_mountroot) {
+#if CONFIG_NETBOOT
+       if (netboot) {

                int err;
                int err;

+
+               netboot = TRUE;

                /* post mount setup */
                if ((err = netboot_setup()) != 0) {
                        PE_display_icon( 0, "noroot");  /* XXX a netboot-specific icon would be nicer */
                        vc_progress_set(FALSE, 0);
                /* post mount setup */
                if ((err = netboot_setup()) != 0) {
                        PE_display_icon( 0, "noroot");  /* XXX a netboot-specific icon would be nicer */
                        vc_progress_set(FALSE, 0);

-                       for (i=1; 1; i*=2) {
+                       for (i = 1; 1; i *= 2) {

                                printf("bsd_init: NetBoot could not find root, error %d: %s\n",
                                printf("bsd_init: NetBoot could not find root, error %d: %s\n",

-                                       err, PE_boot_args());
+                                   err, PE_boot_args());

                                printf("We are hanging here...\n");
                                printf("We are hanging here...\n");

-                               IOSleep(i*60*1000);
+                               IOSleep(i * 60 * 1000);

                        }
                        /*NOTREACHED*/
                }
        }
 #endif
                        }
                        /*NOTREACHED*/
                }
        }
 #endif

-       
+

 
 #if CONFIG_IMAGEBOOT
 
 #if CONFIG_IMAGEBOOT

+#if CONFIG_LOCKERBOOT
+       /*
+        * Stash the protoboot vnode, mount, filesystem name, and device name for
+        * later use. Note that the mount-from name may not have the "/dev/"
+        * component, so we must sniff out this condition and add it as needed.
+        */
+       pbvn = rootvnode;
+       pbmnt = pbvn->v_mount;
+       pbdevp = vfs_statfs(pbmnt)->f_mntfromname;
+       slash_dev = strnstr(pbdevp, "/dev/", strlen(pbdevp));
+       if (slash_dev) {
+               /*
+                * If the old root is a snapshot mount, it will have the form:
+                *
+                *     com.apple.os.update-<boot manifest hash>@<dev node path>
+                *
+                * So we just search the mntfromname for any occurrence of "/dev/" and
+                * grab that as the device path. The image boot code needs a dev node to
+                * do the re-mount, so we cannot directly mount the snapshot as the
+                * protoboot volume currently.
+                */
+               strlcpy(pbdevpath, slash_dev, sizeof(pbdevpath));
+       } else {
+               snprintf(pbdevpath, sizeof(pbdevpath), "/dev/%s", pbdevp);
+       }
+
+       bsd_init_kprintf("protoboot mount-from: %s\n", pbdevp);
+       bsd_init_kprintf("protoboot dev path: %s\n", pbdevpath);
+
+       strlcpy(pbfsname, pbmnt->mnt_vtable->vfc_name, sizeof(pbfsname));
+#endif

        /*
         * See if a system disk image is present. If so, mount it and
         * switch the root vnode to point to it
        /*
         * See if a system disk image is present. If so, mount it and
         * switch the root vnode to point to it

-        */ 
-  
-       if(imageboot_needed()) {
-               int err;
+        */
+       imageboot_type_t imageboot_type = imageboot_needed();
+       if (netboot == FALSE && imageboot_type) {
+               /*
+                * An image was found.  No turning back: we're booted
+                * with a kernel from the disk image.
+                */
+               bsd_init_kprintf("doing image boot: type = %d\n", imageboot_type);
+               imageboot_setup(imageboot_type);
+       }

 
 

-               /* An image was found */
-               if((err = imageboot_setup())) {
-                       /*
-                        * this is not fatal. Keep trying to root
-                        * off the original media
-                        */
-                       printf("%s: imageboot could not find root, %d\n",
-                               __FUNCTION__, err);
+#if CONFIG_LOCKERBOOT
+       if (imageboot_type == IMAGEBOOT_LOCKER) {
+               bsd_init_kprintf("booting from locker\n");
+               if (vnode_tag(rootvnode) != VT_LOCKERFS) {
+                       panic("root filesystem not a locker: fsname = %s",
+                           rootvnode->v_mount->mnt_vtable->vfc_name);

                }
        }
                }
        }

+#endif /* CONFIG_LOCKERBOOT */

 #endif /* CONFIG_IMAGEBOOT */
 #endif /* CONFIG_IMAGEBOOT */

-  
+

        /* set initial time; all other resource data is  already zero'ed */
        /* set initial time; all other resource data is  already zero'ed */

-       microtime(&kernproc->p_start);
-       kernproc->p_stats->p_start = kernproc->p_start; /* for compat */
+       microtime_with_abstime(&kernproc->p_start, &kernproc->p_stats->ps_start);

 
 #if DEVFS
        {
 
 #if DEVFS
        {

-           char mounthere[] = "/dev";  /* !const because of internal casting */
+               char mounthere[] = "/dev"; /* !const because of internal casting */

 
 

-           bsd_init_kprintf("calling devfs_kernel_mount\n");
-           devfs_kernel_mount(mounthere);
+               bsd_init_kprintf("calling devfs_kernel_mount\n");
+               devfs_kernel_mount(mounthere);

        }
 #endif /* DEVFS */
        }
 #endif /* DEVFS */

-       
+
+       if (vfs_mount_rosv_data()) {
+               panic("failed to mount data volume!");
+       }
+
+       if (vfs_mount_vm()) {
+               printf("failed to mount vm volume!");
+       }
+
+#if CONFIG_LOCKERBOOT
+       /*
+        * We need to wait until devfs is up before remounting the protoboot volume
+        * within the locker so that it can have a real devfs vnode backing it.
+        */
+       if (imageboot_type == IMAGEBOOT_LOCKER) {
+               bsd_init_kprintf("re-mounting protoboot volume\n");
+               int error = mount_locker_protoboot(pbfsname, LOCKER_PROTOBOOT_MOUNT,
+                   pbdevpath);
+               if (error) {
+                       panic("failed to mount protoboot volume: dev path = %s, error = %d",
+                           pbdevpath, error);
+               }
+       }
+#endif /* CONFIG_LOCKERBOOT */
+

        /* Initialize signal state for process 0. */
        bsd_init_kprintf("calling siginit\n");
        siginit(kernproc);
        /* Initialize signal state for process 0. */
        bsd_init_kprintf("calling siginit\n");
        siginit(kernproc);


@@ -943,90 +1133,53 @@ bsd_init(void)
        bsd_init_kprintf("calling bsd_utaskbootstrap\n");
        bsd_utaskbootstrap();
 
        bsd_init_kprintf("calling bsd_utaskbootstrap\n");
        bsd_utaskbootstrap();
 

-#if defined(__LP64__)
-       kernproc->p_flag |= P_LP64;
-       printf("Kernel is LP64\n");
-#endif
-#if __i386__ || __x86_64__
-       /* this should be done after the root filesystem is mounted */
-       error = set_archhandler(kernproc, CPU_TYPE_POWERPC);
-       // 10/30/08 - gab: <rdar://problem/6324501>
-       // if default 'translate' can't be found, see if the understudy is available
-       if (ENOENT == error) {
-               strlcpy(exec_archhandler_ppc.path, kRosettaStandIn_str, MAXPATHLEN);
-               error = set_archhandler(kernproc, CPU_TYPE_POWERPC);
-       }
-       if (error) /* XXX make more generic */
-               exec_archhandler_ppc.path[0] = 0;
-#endif 
+       pal_kernel_announce();

 
        bsd_init_kprintf("calling mountroot_post_hook\n");
 
        /* invoke post-root-mount hook */
 
        bsd_init_kprintf("calling mountroot_post_hook\n");
 
        /* invoke post-root-mount hook */

-       if (mountroot_post_hook != NULL)
+       if (mountroot_post_hook != NULL) {

                mountroot_post_hook();
                mountroot_post_hook();

+       }

 
 #if 0 /* not yet */
        consider_zone_gc(FALSE);
 #endif
 
 
 #if 0 /* not yet */
        consider_zone_gc(FALSE);
 #endif
 

-#if CONFIG_EMBEDDED
-       /*
-        * XXX workaround for:
-        * <rdar://problem/6378731> Kirkwood7A135: PPP KEXT no longer loads
-        */
-       OSKextLoadKextWithIdentifier("com.apple.nke.ppp");
-       OSKextLoadKextWithIdentifier("com.apple.nke.l2tp");
-       OSKextLoadKextWithIdentifier("com.apple.nke.pptp");
-#endif
+       /* Initialize System Override call */
+       init_system_override();

 
        bsd_init_kprintf("done\n");
 }
 
 
        bsd_init_kprintf("done\n");
 }
 

-/* Called with kernel funnel held */

 void
 bsdinit_task(void)
 {
        proc_t p = current_proc();
 void
 bsdinit_task(void)
 {
        proc_t p = current_proc();

-       struct uthread *ut;
-       thread_t thread;

 
        process_name("init", p);
 
 
        process_name("init", p);
 

-       ux_handler_init();
-
-       thread = current_thread();
-       (void) host_set_exception_ports(host_priv_self(),
-                                       EXC_MASK_ALL & ~(EXC_MASK_RPC_ALERT),//pilotfish (shark) needs this port
-                                       (mach_port_t) ux_exception_port,
-                                       EXCEPTION_DEFAULT| MACH_EXCEPTION_CODES,
-                                       0);
-
-       ut = (uthread_t)get_bsdthread_info(thread);
-
-       bsd_init_task = get_threadtask(thread);
-       init_task_failure_data[0] = 0;
+       /* Set up exception-to-signal reflection */
+       ux_handler_setup();

 
 #if CONFIG_MACF
        mac_cred_label_associate_user(p->p_ucred);
 
 #if CONFIG_MACF
        mac_cred_label_associate_user(p->p_ucred);

-       mac_task_label_update_cred (p->p_ucred, (struct task *) p->task);

 #endif
 #endif

-       load_init_program(p);
-       lock_trace = 1;
-}

 
 

-void
-lightning_bolt(__unused void *dummy)
-{                      
-       boolean_t       funnel_state;
+       vm_init_before_launchd();

 
 

-       funnel_state = thread_funnel_set(kernel_flock, TRUE);
+#if CONFIG_XNUPOST
+       int result = bsd_list_tests();
+       result = bsd_do_post();
+       if (result != 0) {
+               panic("bsd_do_post: Tests failed with result = 0x%08x\n", result);
+       }
+#endif

 
 

-       thread_wakeup(&lbolt);
-       timeout(lightning_bolt,0,hz);
-       klogwakeup();
+       bsd_init_kprintf("bsd_do_post - done");

 
 

-       (void) thread_funnel_set(kernel_flock, FALSE);
+       load_init_program(p);
+       lock_trace = 1;

 }
 
 kern_return_t
 }
 
 kern_return_t


@@ -1035,17 +1188,18 @@ bsd_autoconf(void)
        kprintf("bsd_autoconf: calling kminit\n");
        kminit();
 
        kprintf("bsd_autoconf: calling kminit\n");
        kminit();
 

-       /* 
+       /*

         * Early startup for bsd pseudodevices.
         */
        {
         * Early startup for bsd pseudodevices.
         */
        {

-           struct pseudo_init *pi;
-       
-           for (pi = pseudo_inits; pi->ps_func; pi++)
-               (*pi->ps_func) (pi->ps_count);
+               struct pseudo_init *pi;
+
+               for (pi = pseudo_inits; pi->ps_func; pi++) {
+                       (*pi->ps_func)(pi->ps_count);
+               }

        }
 
        }
 

-       return( IOKitBSDInit());
+       return IOKitBSDInit();

 }
 
 
 }
 
 


@@ -1053,36 +1207,30 @@ bsd_autoconf(void)
 
 static void
 setconf(void)
 
 static void
 setconf(void)

-{      
-       u_int32_t       flags;
-       kern_return_t   err;
+{
+       u_int32_t       flags;
+       kern_return_t   err;

 
 

-       /*
-        * calls into IOKit can generate networking registrations
-        * which needs to be under network funnel. Right thing to do
-        * here is to drop the funnel alltogether and regrab it afterwards
-        */

        err = IOFindBSDRoot(rootdevice, sizeof(rootdevice), &rootdev, &flags);
        err = IOFindBSDRoot(rootdevice, sizeof(rootdevice), &rootdev, &flags);

-       if( err) {
+       if (err) {

                printf("setconf: IOFindBSDRoot returned an error (%d);"
                printf("setconf: IOFindBSDRoot returned an error (%d);"

-                       "setting rootdevice to 'sd0a'.\n", err); /* XXX DEBUG TEMP */
+                   "setting rootdevice to 'sd0a'.\n", err);     /* XXX DEBUG TEMP */

                rootdev = makedev( 6, 0 );
                strlcpy(rootdevice, "sd0a", sizeof(rootdevice));
                flags = 0;
        }
 
                rootdev = makedev( 6, 0 );
                strlcpy(rootdevice, "sd0a", sizeof(rootdevice));
                flags = 0;
        }
 

-#if NFSCLIENT
-       if( flags & 1 ) {
+#if CONFIG_NETBOOT
+       if (flags & 1) {

                /* network device */
                mountroot = netboot_mountroot;
        } else {
 #endif
                /* network device */
                mountroot = netboot_mountroot;
        } else {
 #endif

-               /* otherwise have vfs determine root filesystem */
-               mountroot = NULL;
-#if NFSCLIENT
-       }
+       /* otherwise have vfs determine root filesystem */
+       mountroot = NULL;
+#if CONFIG_NETBOOT
+}

 #endif
 #endif

-

 }
 
 void
 }
 
 void


@@ -1095,13 +1243,14 @@ bsd_utaskbootstrap(void)
         * Clone the bootstrap process from the kernel process, without
         * inheriting either task characteristics or memory from the kernel;
         */
         * Clone the bootstrap process from the kernel process, without
         * inheriting either task characteristics or memory from the kernel;
         */

-       thread = cloneproc(TASK_NULL, kernproc, FALSE);
+       thread = cloneproc(TASK_NULL, COALITION_NULL, kernproc, FALSE, TRUE);

 
        /* Hold the reference as it will be dropped during shutdown */
 
        /* Hold the reference as it will be dropped during shutdown */

-       initproc = proc_find(1);                                
+       initproc = proc_find(1);

 #if __PROC_INTERNAL_DEBUG
 #if __PROC_INTERNAL_DEBUG

-       if (initproc == PROC_NULL)
+       if (initproc == PROC_NULL) {

                panic("bsd_utaskbootstrap: initproc not set\n");
                panic("bsd_utaskbootstrap: initproc not set\n");

+       }

 #endif
        /*
         * Since we aren't going back out the normal way to our parent,
 #endif
        /*
         * Since we aren't going back out the normal way to our parent,


@@ -1113,79 +1262,198 @@ bsd_utaskbootstrap(void)
        ut = (struct uthread *)get_bsdthread_info(thread);
        ut->uu_sigmask = 0;
        act_set_astbsd(thread);
        ut = (struct uthread *)get_bsdthread_info(thread);
        ut->uu_sigmask = 0;
        act_set_astbsd(thread);

-       (void) thread_resume(thread);
+       task_clear_return_wait(get_threadtask(thread), TCRW_CLEAR_ALL_WAIT);

 }
 
 static void
 parse_bsd_args(void)
 {
 }
 
 static void
 parse_bsd_args(void)
 {

-       char namep[16];
+       char namep[48];

        int msgbuf;
 
        int msgbuf;
 

-       if (PE_parse_boot_argn("-s", namep, sizeof (namep)))
+       if (PE_parse_boot_argn("-s", namep, sizeof(namep))) {

                boothowto |= RB_SINGLE;
                boothowto |= RB_SINGLE;

+       }

 
 

-       if (PE_parse_boot_argn("-b", namep, sizeof (namep)))
-               boothowto |= RB_NOBOOTRC;
-
-       if (PE_parse_boot_argn("-x", namep, sizeof (namep))) /* safe boot */
+       if (PE_parse_boot_argn("-x", namep, sizeof(namep))) { /* safe boot */

                boothowto |= RB_SAFEBOOT;
                boothowto |= RB_SAFEBOOT;

+       }
+
+       if (PE_parse_boot_argn("-minimalboot", namep, sizeof(namep))) {
+               /*
+                * -minimalboot indicates that we want userspace to be bootstrapped to a
+                * minimal environment.  What constitutes minimal is up to the bootstrap
+                * process.
+                */
+               minimalboot = 1;
+       }
+
+#if __x86_64__
+       int no32exec;
+
+       /* disable 32 bit grading */
+       if (PE_parse_boot_argn("no32exec", &no32exec, sizeof(no32exec))) {
+               bootarg_no32exec = !!no32exec;
+       }
+#endif

 
 

-       if (PE_parse_boot_argn("-l", namep, sizeof (namep))) /* leaks logging */
-               turn_on_log_leaks = 1;
+       int execfailure_crashreports;
+       /* enable crash reports on various exec failures */
+       if (PE_parse_boot_argn("execfailurecrashes", &execfailure_crashreports, sizeof(execfailure_crashreports))) {
+               bootarg_execfailurereports = !!execfailure_crashreports;
+       }
+
+       /* disable vnode_cache_is_authorized() by setting vnode_cache_defeat */
+       if (PE_parse_boot_argn("-vnode_cache_defeat", namep, sizeof(namep))) {
+               bootarg_vnode_cache_defeat = 1;
+       }

 
 

-       /* disable 64 bit grading */
-       if (PE_parse_boot_argn("-no64exec", namep, sizeof (namep)))
-               bootarg_no64exec = 1;
+#if DEVELOPMENT || DEBUG
+       if (PE_parse_boot_argn("-disable_aslr", namep, sizeof(namep))) {
+               bootarg_disable_aslr = 1;
+       }
+#endif

 
 

-       PE_parse_boot_argn("ncl", &ncl, sizeof (ncl));
+       PE_parse_boot_argn("ncl", &ncl, sizeof(ncl));

        if (PE_parse_boot_argn("nbuf", &max_nbuf_headers,
        if (PE_parse_boot_argn("nbuf", &max_nbuf_headers,

-                               sizeof (max_nbuf_headers))) {
+           sizeof(max_nbuf_headers))) {

                customnbuf = 1;
        }
                customnbuf = 1;
        }

-#if !defined(SECURE_KERNEL)
-       PE_parse_boot_argn("kmem", &setup_kmem, sizeof (setup_kmem));
+
+#if CONFIG_MACF
+#if defined (__i386__) || defined (__x86_64__)
+       PE_parse_boot_argn("policy_check", &policy_check_flags, sizeof(policy_check_flags));

 #endif
 #endif

-       PE_parse_boot_argn("trace", &new_nkdbufs, sizeof (new_nkdbufs));
+#endif  /* CONFIG_MACF */

 
 

-       if (PE_parse_boot_argn("msgbuf", &msgbuf, sizeof (msgbuf))) {
+       if (PE_parse_boot_argn("msgbuf", &msgbuf, sizeof(msgbuf))) {

                log_setsize(msgbuf);
                log_setsize(msgbuf);

+               oslog_setsize(msgbuf);

        }
        }

+
+       if (PE_parse_boot_argn("-novfscache", namep, sizeof(namep))) {
+               nc_disabled = 1;
+       }
+
+#if CONFIG_JETSAM && (DEVELOPMENT || DEBUG)
+       if (PE_parse_boot_argn("-no_vnode_jetsam", namep, sizeof(namep))) {
+               bootarg_no_vnode_jetsam = 1;
+       }
+#endif /* CONFIG_JETSAM && (DEVELOPMENT || DEBUG) */
+
+       if (PE_parse_boot_argn("-no_vnode_drain", namep, sizeof(namep))) {
+               bootarg_no_vnode_drain = 1;
+       }
+
+#if CONFIG_EMBEDDED
+       /*
+        * The darkboot flag is specified by the bootloader and is stored in
+        * boot_args->bootFlags. This flag is available starting revision 2.
+        */
+       boot_args *args = (boot_args *) PE_state.bootArgs;
+       if ((args != NULL) && (args->Revision >= kBootArgsRevision2)) {
+               darkboot = (args->bootFlags & kBootFlagsDarkBoot) ? 1 : 0;
+       } else {
+               darkboot = 0;
+       }
+#endif
+
+#if PROC_REF_DEBUG
+       if (PE_parse_boot_argn("-disable_procref_tracking", namep, sizeof(namep))) {
+               proc_ref_tracking_disabled = 1;
+       }
+#endif
+
+#if OS_REASON_DEBUG
+       if (PE_parse_boot_argn("-disable_osreason_debug", namep, sizeof(namep))) {
+               os_reason_debug_disabled = 1;
+       }
+#endif
+
+       PE_parse_boot_argn("sigrestrict", &sigrestrict_arg, sizeof(sigrestrict_arg));
+
+#if DEVELOPMENT || DEBUG
+       if (PE_parse_boot_argn("-no_sigsys", namep, sizeof(namep))) {
+               send_sigsys = false;
+       }
+
+       if (PE_parse_boot_argn("alt-dyld", dyld_alt_path, sizeof(dyld_alt_path))) {
+               if (strlen(dyld_alt_path) > 0) {
+                       use_alt_dyld = 1;
+               }
+       }
+       PE_parse_boot_argn("dyld_flags", &dyld_flags, sizeof(dyld_flags));
+
+       if (PE_parse_boot_argn("-disable_syscallfilter", &namep, sizeof(namep))) {
+               syscallfilter_disable = 1;
+       }
+
+#if __arm64__
+       if (PE_parse_boot_argn("legacy_footprint_entitlement_mode", &legacy_footprint_entitlement_mode, sizeof(legacy_footprint_entitlement_mode))) {
+               /*
+                * legacy_footprint_entitlement_mode specifies the behavior we want associated
+                * with the entitlement. The supported modes are:
+                *
+                * LEGACY_FOOTPRINT_ENTITLEMENT_IGNORE:
+                *      Indicates that we want every process to have the memory accounting
+                *      that is available in iOS 12.0 and beyond.
+                *
+                * LEGACY_FOOTPRINT_ENTITLEMENT_IOS11_ACCT:
+                *      Indicates that for every process that has the 'legacy footprint entitlement',
+                *      we want to give it the old iOS 11.0 accounting behavior which accounted some
+                *      of the process's memory to the kernel.
+                *
+                * LEGACY_FOOTPRINT_ENTITLEMENT_LIMIT_INCREASE:
+                *      Indicates that for every process that has the 'legacy footprint entitlement',
+                *      we want it to have a higher memory limit which will help them acclimate to the
+                *      iOS 12.0 (& beyond) accounting behavior that does the right accounting.
+                *      The bonus added to the system-wide task limit to calculate this higher memory limit
+                *      is available in legacy_footprint_bonus_mb.
+                */
+
+               if (legacy_footprint_entitlement_mode < LEGACY_FOOTPRINT_ENTITLEMENT_IGNORE ||
+                   legacy_footprint_entitlement_mode > LEGACY_FOOTPRINT_ENTITLEMENT_LIMIT_INCREASE) {
+                       legacy_footprint_entitlement_mode = LEGACY_FOOTPRINT_ENTITLEMENT_LIMIT_INCREASE;
+               }
+       }
+#endif /* __arm64__ */
+#endif /* DEVELOPMENT || DEBUG */

 }
 
 void
 bsd_exec_setup(int scale)
 {
 }
 
 void
 bsd_exec_setup(int scale)
 {

-

        switch (scale) {
        switch (scale) {

-               case 0:
-               case 1:
-                       bsd_simul_execs = BSD_SIMUL_EXECS;
-                       break;
-               case 2:
-               case 3:
-                       bsd_simul_execs = 65;
-                       break;
-               case 4:
-               case 5:
-                       bsd_simul_execs = 129;
-                       break;
-               case 6:
-               case 7:
-                       bsd_simul_execs = 257;
-                       break;
-               default:
-                       bsd_simul_execs = 513;
-                       break;
-                       
+       case 0:
+       case 1:
+               bsd_simul_execs = BSD_SIMUL_EXECS;
+               break;
+       case 2:
+       case 3:
+               bsd_simul_execs = 65;
+               break;
+       case 4:
+       case 5:
+               bsd_simul_execs = 129;
+               break;
+       case 6:
+       case 7:
+               bsd_simul_execs = 257;
+               break;
+       default:
+               bsd_simul_execs = 513;
+               break;

        }
        }

-       bsd_pageable_map_size = (bsd_simul_execs * (NCARGS + PAGE_SIZE));
+       bsd_pageable_map_size = (bsd_simul_execs * BSD_PAGEABLE_SIZE_PER_EXEC);

 }
 
 }
 

-#if !NFSCLIENT
-int 
+#if !CONFIG_NETBOOT
+int
+netboot_root(void);
+
+int

 netboot_root(void)
 {
 netboot_root(void)
 {

-       return(0);
+       return 0;

 }
 #endif
 }
 #endif