]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/kern/bsd_init.c
xnu-792.10.96.tar.gz
[apple/xnu.git] / bsd / kern / bsd_init.c
index 1934f20f9923509504e83aae0ab0eaaf4c03f43f..05b66d5301077a46819f9b1ee061bc7ae3d7641c 100644 (file)
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  * All rights reserved.  The CMU software License Agreement specifies
  * the terms and conditions for use and redistribution.
  */
  * All rights reserved.  The CMU software License Agreement specifies
  * the terms and conditions for use and redistribution.
  */
-/*
- * HISTORY
- * 16-Apr-98  A. Ramesh at Apple
- *     Created for Apple Core from DR2 init_main.c.
- */
-
-#include <quota.h>
 
 #include <sys/param.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 
 #include <sys/param.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
-#include <sys/mount.h>
-#include <sys/proc.h>
+#include <sys/mount_internal.h>
+#include <sys/proc_internal.h>
+#include <sys/kauth.h>
 #include <sys/systm.h>
 #include <sys/systm.h>
-#include <sys/vnode.h>
+#include <sys/vnode_internal.h>
 #include <sys/conf.h>
 #include <sys/conf.h>
-#include <sys/buf.h>
+#include <sys/buf_internal.h>
 #include <sys/clist.h>
 #include <sys/user.h>
 #include <sys/clist.h>
 #include <sys/user.h>
-#include <ufs/ufs/quota.h>
+#include <sys/time.h>
+#include <sys/systm.h>
+#include <sys/mman.h>
+
+#include <bsm/audit_kernel.h>
 
 #include <sys/malloc.h>
 #include <sys/dkstat.h>
 
 
 #include <sys/malloc.h>
 #include <sys/dkstat.h>
 
-#include <machine/spl.h>
+#include <kern/startup.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <kern/ast.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <kern/ast.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
-#include <sys/ux_exception.h>
+#include <sys/ux_exception.h>  /* for ux_exception_port */
 
 #include <sys/reboot.h>
 #include <mach/exception_types.h>
 
 #include <sys/reboot.h>
 #include <mach/exception_types.h>
-#include <dev/busvar.h>
+#include <dev/busvar.h>                        /* for pseudo_inits */
 #include <sys/kdebug.h>
 
 #include <mach/mach_types.h>
 #include <sys/kdebug.h>
 
 #include <mach/mach_types.h>
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 
 #include <kern/clock.h>
 #include <mach/kern_return.h>
 
-extern shared_region_mapping_t       system_shared_region;
+#include <mach/shared_memory_server.h>
+#include <vm/vm_shared_memory_server.h>
+
+#include <net/init.h>
+
+#include <machine/exec.h>
+
+extern int app_profile;                /* on/off switch for pre-heat cache */
 
 char    copyright[] =
 
 char    copyright[] =
-"Copyright (c) 1982, 1986, 1989, 1991, 1993\n\tThe 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";
 
 extern void    ux_handler();
 
 
 extern void    ux_handler();
 
@@ -125,30 +132,18 @@ extern void       ux_handler();
 struct proc proc0;
 struct session session0;
 struct pgrp pgrp0;
 struct proc proc0;
 struct session session0;
 struct pgrp pgrp0;
-struct pcred cred0;
 struct filedesc filedesc0;
 struct plimit limit0;
 struct pstats pstats0;
 struct sigacts sigacts0;
 struct proc *kernproc, *initproc;
 
 struct filedesc filedesc0;
 struct plimit limit0;
 struct pstats pstats0;
 struct sigacts sigacts0;
 struct proc *kernproc, *initproc;
 
-
-long cp_time[CPUSTATES];
-long dk_seek[DK_NDRIVE];
-long dk_time[DK_NDRIVE];
-long dk_wds[DK_NDRIVE];
-long dk_wpms[DK_NDRIVE];
-long dk_xfer[DK_NDRIVE];
-long dk_bps[DK_NDRIVE];
-
-int dk_busy;
-int dk_ndrive;
-
 long tk_cancc;
 long tk_nin;
 long tk_nout;
 long tk_rawcc;
 
 long tk_cancc;
 long tk_nin;
 long tk_nout;
 long tk_rawcc;
 
+int lock_trace = 0;
 /* Global variables to make pstat happy. We do swapping differently */
 int nswdev, nswap;
 int nswapmap;
 /* Global variables to make pstat happy. We do swapping differently */
 int nswdev, nswap;
 int nswapmap;
@@ -160,15 +155,18 @@ dev_t     dumpdev;                /* device to take dumps on */
 long   dumplo;                 /* offset into dumpdev */
 long   hostid;
 char   hostname[MAXHOSTNAMELEN];
 long   dumplo;                 /* offset into dumpdev */
 long   hostid;
 char   hostname[MAXHOSTNAMELEN];
-int    hostnamelen;
+int            hostnamelen;
 char   domainname[MAXDOMNAMELEN];
 char   domainname[MAXDOMNAMELEN];
-int    domainnamelen;
+int            domainnamelen;
+#if __i386__
+struct exec_archhandler exec_archhandler_ppc = {
+       .path = "/usr/libexec/oah/translate",
+};
+#else /* __i386__ */
+struct exec_archhandler exec_archhandler_ppc;
+#endif /* __i386__ */
 
 char rootdevice[16];   /* hfs device names have at least 9 chars */
 
 char rootdevice[16];   /* hfs device names have at least 9 chars */
-struct timeval boottime;               /* GRODY!  This has to go... */
-#if FIXME  /* [ */
-struct timeval time;
-#endif  /* FIXME ] */
 
 #ifdef  KMEMSTATS
 struct kmemstats kmemstats[M_LAST];
 
 #ifdef  KMEMSTATS
 struct kmemstats kmemstats[M_LAST];
@@ -178,22 +176,36 @@ int       lbolt;                          /* awoken once a second */
 struct vnode *rootvp;
 int boothowto = RB_DEBUG;
 
 struct vnode *rootvp;
 int boothowto = RB_DEBUG;
 
-#define        BSD_PAGABLE_MAP_SIZE    (4 * 512 * 1024)
+#define        BSD_PAGABLE_MAP_SIZE    (16 * 512 * 1024)
 vm_map_t       bsd_pageable_map;
 vm_map_t       mb_map;
 semaphore_t execve_semaphore;
 
 int    cmask = CMASK;
 vm_map_t       bsd_pageable_map;
 vm_map_t       mb_map;
 semaphore_t execve_semaphore;
 
 int    cmask = CMASK;
+extern int customnbuf;
 
 int parse_bsd_args(void);
 extern int bsd_hardclockinit;
 
 int parse_bsd_args(void);
 extern int bsd_hardclockinit;
-extern vm_address_t bsd_init_task;
+extern task_t bsd_init_task;
 extern char    init_task_failure_data[];
 extern char    init_task_failure_data[];
+extern void time_zone_slock_init(void);
+static void process_name(char *, struct proc *);
+
+static void setconf(void);
 
 
-funnel_t * kernel_flock;
-funnel_t * network_flock;
-int disable_funnel = 0;                /* disables split funnel */
-int enable_funnel = 0;         /* disables split funnel */
+funnel_t *kernel_flock;
+
+extern void sysv_shm_lock_init(void);
+extern void sysv_sem_lock_init(void);
+extern void sysv_msg_lock_init(void);
+extern void pshm_lock_init();
+extern void psem_lock_init();
+extern int maxprocperuid;
+
+/* kmem access not enabled by default; can be changed with boot-args */
+int setup_kmem = 0;
+
+extern void stackshot_lock_init();
 
 /*
  * Initialization code.
 
 /*
  * Initialization code.
@@ -201,20 +213,17 @@ int enable_funnel = 0;            /* disables split funnel */
  * soon as a stack and segmentation
  * have been established.
  * Functions:
  * soon as a stack and segmentation
  * have been established.
  * Functions:
- *     clear and free user core
  *     turn on clock
  *     hand craft 0th process
  *     call all initialization routines
  *     turn on clock
  *     hand craft 0th process
  *     call all initialization routines
- *     fork - process 0 to schedule
- *          - process 1 execute bootstrap
- *          - process 2 to page out
+ *  hand craft 1st user process
  */
 
 /*
  *     Sets the name for the given task.
  */
  */
 
 /*
  *     Sets the name for the given task.
  */
-void
-proc_name(s, p)
+static void
+process_name(s, p)
        char            *s;
        struct proc *p;
 {
        char            *s;
        struct proc *p;
 {
@@ -225,86 +234,75 @@ proc_name(s, p)
                        length + 1);
 }
 
                        length + 1);
 }
 
-
 /* To allow these values to be patched, they're globals here */
 #include <machine/vmparam.h>
 struct rlimit vm_initial_limit_stack = { DFLSSIZ, MAXSSIZ };
 struct rlimit vm_initial_limit_data = { DFLDSIZ, MAXDSIZ };
 struct rlimit vm_initial_limit_core = { DFLCSIZ, MAXCSIZ };
 
 /* To allow these values to be patched, they're globals here */
 #include <machine/vmparam.h>
 struct rlimit vm_initial_limit_stack = { DFLSSIZ, MAXSSIZ };
 struct rlimit vm_initial_limit_data = { DFLDSIZ, MAXDSIZ };
 struct rlimit vm_initial_limit_core = { DFLCSIZ, MAXCSIZ };
 
-extern thread_t first_thread;
+extern thread_t        cloneproc(struct proc *, int);
+extern int     (*mountroot)(void);
+extern int     netboot_mountroot();    /* netboot.c */
+extern int     netboot_setup(struct proc * p);
 
 
-#define SPL_DEBUG      0
-#if    SPL_DEBUG
-#define        dprintf(x)      printf x
-#else  SPL_DEBUG
-#define dprintf(x)
-#endif /* SPL_DEBUG */
+lck_grp_t * proc_lck_grp;
+lck_grp_attr_t * proc_lck_grp_attr;
+lck_attr_t * proc_lck_attr;
 
 
-extern thread_t        cloneproc(struct proc *, int);
+/* hook called after root is mounted XXX temporary hack */
+void (*mountroot_post_hook)(void);
 
 
+/*
+ * 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
+ * in the context of the current (startup) task using a call to the
+ * function kernel_thread_create() to jump into start_kernel_threads().
+ * Internally, kernel_thread_create() calls thread_create_internal(),
+ * which calls uthread_alloc().  The function of uthread_alloc() is
+ * normally to allocate a uthread structure, and fill out the uu_sigmask,
+ * uu_act, and uu_ucred fields.  It skips filling these out in the case
+ * of the "task" being "kernel_task", because the order of operation is
+ * inverted.  To account for that, we need to manually fill in at least
+ * the uu_cred field so that the uthread structure can be used like any
+ * other.
+ */
 void
 bsd_init()
 {
        register struct proc *p;
 void
 bsd_init()
 {
        register struct proc *p;
-       extern struct ucred *rootcred;
+       struct uthread *ut;
+       extern kauth_cred_t rootcred;
        register int i;
        int s;
        register int i;
        int s;
+       int error;
        thread_t        th;
        thread_t        th;
-       extern void     bsdinit_task();
+       struct vfs_context context;
        void            lightning_bolt(void );
        kern_return_t   ret;
        boolean_t funnel_state;
        void            lightning_bolt(void );
        kern_return_t   ret;
        boolean_t funnel_state;
-       extern void uthread_zone_init();
-
-       extern int (*mountroot) __P((void));
-
-
-#if 1
-       /* split funnel is enabled by default */
-       PE_parse_boot_arg("dfnl", &disable_funnel);
-#else
-       /* split funnel is disabled befault */
-       disable_funnel = 1;
-       PE_parse_boot_arg("efnl", &enable_funnel);
-       if (enable_funnel)  {
-                       /* enable only if efnl is set in bootarg */
-                       disable_funnel = 0;
-       }
-#endif
+       struct ucred temp_cred;
+       extern void file_lock_init(void);
 
        kernel_flock = funnel_alloc(KERNEL_FUNNEL);
        if (kernel_flock == (funnel_t *)0 ) {
 
        kernel_flock = funnel_alloc(KERNEL_FUNNEL);
        if (kernel_flock == (funnel_t *)0 ) {
-               panic("bsd_init: Fail to allocate kernel mutex lock");
+               panic("bsd_init: Failed to allocate kernel funnel");
        }
         
        }
         
-        
        funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
        funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
-       if (!disable_funnel) {
-               network_flock = funnel_alloc(NETWORK_FUNNEL);
-               if (network_flock == (funnel_t *)0 ) {
-                       panic("bds_init: Fail to allocate network mutex lock");
-               }
-       } else {
-               network_flock = kernel_flock;
-       }
-
-        
        printf(copyright);
        printf(copyright);
-
+       
        kmeminit();
        
        parse_bsd_args();
 
        kmeminit();
        
        parse_bsd_args();
 
-       bsd_bufferinit();
-
        /* Initialize the uthread zone */
        /* Initialize the uthread zone */
-       uthread_zone_init();
+       //uthread_zone_init();  /* XXX redundant: previous uthread_alloc() */
 
 
-       /*
-        * Initialize process and pgrp structures.
-        */
+       /* Initialize kauth subsystem before instancing the first credential */
+       kauth_init();
+
+       /* Initialize process and pgrp structures. */
        procinit();
 
        kernproc = &proc0;
        procinit();
 
        kernproc = &proc0;
@@ -312,15 +310,29 @@ bsd_init()
        p = kernproc;
 
        /* kernel_task->proc = kernproc; */
        p = kernproc;
 
        /* kernel_task->proc = kernproc; */
-       set_bsdtask_info(kernel_task,(void *)kernproc);
+       set_bsdtask_info(kernel_task,(void *)p);
        p->p_pid = 0;
 
        /* give kernproc a name */
        p->p_pid = 0;
 
        /* give kernproc a name */
-       proc_name("kernel_task", p);
+       process_name("kernel_task", p);
+
+       /* allocate proc lock group attribute and group */
+       proc_lck_grp_attr= lck_grp_attr_alloc_init();
+       
+       proc_lck_grp = lck_grp_alloc_init("proc",  proc_lck_grp_attr);
+
+       /* Allocate proc lock attribute */
+       proc_lck_attr = lck_attr_alloc_init();
+
+       lck_mtx_init(&p->p_mlock, proc_lck_grp, proc_lck_attr);
+       lck_mtx_init(&p->p_fdmlock, proc_lck_grp, proc_lck_attr);
 
        if (current_task() != kernel_task)
 
        if (current_task() != kernel_task)
-               printf("We are in for problem, current task in not kernel task\n");
+               printf("bsd_init: We have a problem, "
+                               "current task is not kernel task\n");
        
        
+       ut = (uthread_t)get_bsdthread_info(current_thread());
+
        /*
         * Create process 0.
         */
        /*
         * Create process 0.
         */
@@ -337,25 +349,44 @@ bsd_init()
        p->task = kernel_task;
        
        p->p_stat = SRUN;
        p->task = kernel_task;
        
        p->p_stat = SRUN;
-       p->p_flag = P_INMEM|P_SYSTEM;
+       p->p_flag = P_SYSTEM;
        p->p_nice = NZERO;
        p->p_pptr = p;
        lockinit(&p->signal_lock, PVM, "signal", 0, 0);
        p->p_nice = NZERO;
        p->p_pptr = p;
        lockinit(&p->signal_lock, PVM, "signal", 0, 0);
+       TAILQ_INIT(&p->p_uthlist);
        p->sigwait = FALSE;
        p->sigwait_thread = THREAD_NULL;
        p->exit_thread = THREAD_NULL;
 
        p->sigwait = FALSE;
        p->sigwait_thread = THREAD_NULL;
        p->exit_thread = THREAD_NULL;
 
-       /* Create credentials. */
-       lockinit(&cred0.pc_lock, PLOCK, "proc0 cred", 0, 0);
-       cred0.p_refcnt = 1;
-       p->p_cred = &cred0;
-       p->p_ucred = crget();
-       p->p_ucred->cr_ngroups = 1;     /* group 0 */
+       /*
+        * Create credential.  This also Initializes the audit information.
+        * XXX It is not clear what the initial values should be for audit ID,
+        * XXX session ID, etc..
+        */
+       bzero(&temp_cred, sizeof(temp_cred));
+       temp_cred.cr_ngroups = 1;
+
+       p->p_ucred = kauth_cred_create(&temp_cred); 
+
+       /* give the (already exisiting) initial thread a reference on it */
+       kauth_cred_ref(p->p_ucred);
+       ut->uu_ucred = p->p_ucred;
+       
+       TAILQ_INIT(&p->aio_activeq);
+       TAILQ_INIT(&p->aio_doneq);
+       p->aio_active_count = 0;
+       p->aio_done_count = 0;
+
+       file_lock_init();
 
        /* Create the file descriptor table. */
        filedesc0.fd_refcnt = 1+1;      /* +1 so shutdown will not _FREE_ZONE */
        p->p_fd = &filedesc0;
        filedesc0.fd_cmask = cmask;
 
        /* Create the file descriptor table. */
        filedesc0.fd_refcnt = 1+1;      /* +1 so shutdown will not _FREE_ZONE */
        p->p_fd = &filedesc0;
        filedesc0.fd_cmask = cmask;
+       filedesc0.fd_knlistsize = -1;
+       filedesc0.fd_knlist = NULL;
+       filedesc0.fd_knhash = NULL;
+       filedesc0.fd_knhashmask = 0;
 
        /* Create the limits structures. */
        p->p_limit = &limit0;
 
        /* Create the limits structures. */
        p->p_limit = &limit0;
@@ -363,7 +394,8 @@ bsd_init()
                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[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 = MAXUPRC;
+       limit0.pl_rlimit[RLIMIT_NPROC].rlim_cur = maxprocperuid;
+       limit0.pl_rlimit[RLIMIT_NPROC].rlim_max = maxproc;
        limit0.pl_rlimit[RLIMIT_STACK] = vm_initial_limit_stack;
        limit0.pl_rlimit[RLIMIT_DATA] = vm_initial_limit_data;
        limit0.pl_rlimit[RLIMIT_CORE] = vm_initial_limit_core;
        limit0.pl_rlimit[RLIMIT_STACK] = vm_initial_limit_stack;
        limit0.pl_rlimit[RLIMIT_DATA] = vm_initial_limit_data;
        limit0.pl_rlimit[RLIMIT_CORE] = vm_initial_limit_core;
@@ -373,11 +405,10 @@ bsd_init()
        p->p_sigacts = &sigacts0;
 
        /*
        p->p_sigacts = &sigacts0;
 
        /*
-        * Charge root for one process.
+        * Charge root for two  processes: init and mach_init.
         */
        (void)chgproccnt(0, 1);
 
         */
        (void)chgproccnt(0, 1);
 
-       
        /*
         *      Allocate a kernel submap for pageable memory
         *      for temporary copying (execve()).
        /*
         *      Allocate a kernel submap for pageable memory
         *      for temporary copying (execve()).
@@ -389,24 +420,26 @@ bsd_init()
                                &min,
                                (vm_size_t)BSD_PAGABLE_MAP_SIZE,
                                TRUE,
                                &min,
                                (vm_size_t)BSD_PAGABLE_MAP_SIZE,
                                TRUE,
-                               TRUE,
+                               VM_FLAGS_ANYWHERE,
                                &bsd_pageable_map);
                                &bsd_pageable_map);
-       if (ret != KERN_SUCCESS) 
-               panic("bsd_init: Failed to allocare bsd pageable map");
+               if (ret != KERN_SUCCESS) 
+                       panic("bsd_init: Failed to allocate bsd pageable map");
        }
 
        }
 
-       /* Initialize the execve() semaphore */
-       {
-               kern_return_t kret;
-               int value;
-
-               value = BSD_PAGABLE_MAP_SIZE / NCARGS;
+       /*
+        * Initialize buffers and hash links for buffers
+        *
+        * SIDE EFFECT: Starts a thread for bcleanbuf_thread(), so must
+        *              happen after a credential has been associated with
+        *              the kernel task.
+        */
+       bsd_bufferinit();
 
 
-               kret = semaphore_create(kernel_task, &execve_semaphore,
-                               SYNC_POLICY_FIFO, value);
-               if (kret != KERN_SUCCESS)
-                       panic("bsd_init: Failed to create execve semaphore");
-       }
+       /* Initialize the execve() semaphore */
+       ret = semaphore_create(kernel_task, &execve_semaphore,
+                       SYNC_POLICY_FIFO, (BSD_PAGABLE_MAP_SIZE / NCARGS));
+       if (ret != KERN_SUCCESS)
+               panic("bsd_init: Failed to create execve semaphore");
 
        /*
         * Initialize the calendar.
 
        /*
         * Initialize the calendar.
@@ -421,36 +454,51 @@ bsd_init()
        /* Initialize mbuf's. */
        mbinit();
 
        /* Initialize mbuf's. */
        mbinit();
 
-       /* Initialize syslog */
-       log_init();
+       /*
+        * Initializes security event auditing.
+        * XXX: Should/could this occur later?
+        */
+       audit_init();  
 
 
-       /* Initialize SysV shm */
-       shminit();
+       /* Initialize kqueues */
+       knote_init();
 
 
-        /* POSIX Shm and Sem */
-        pshm_cache_init();
-        psem_cache_init();
-        
+       /* Initialize for async IO */
+       aio_init();
+
+       /* Initialize pipes */
+       pipeinit();
+
+       /* Initialize SysV shm subsystem locks; the subsystem proper is
+        * initialized through a sysctl.
+        */
+       sysv_shm_lock_init();
+       sysv_sem_lock_init();
+       sysv_msg_lock_init();
+       pshm_lock_init();
+       psem_lock_init();
+
+       /* POSIX Shm and Sem */
+       pshm_cache_init();
+       psem_cache_init();
+       time_zone_slock_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.
         */
-       s = splimp();
        sysctl_register_fixed(); 
        sysctl_register_fixed(); 
+       sysctl_mib_init();
        dlil_init();
        dlil_init();
+       proto_kpi_init();
        socketinit();
        domaininit();
        socketinit();
        domaininit();
-       splx(s);
 
 
-       /*
-        *      Create kernel idle cpu processes.  This must be done
-        *      before a context switch can occur (and hence I/O can
-        *      happen in the binit() call).
-        */
        p->p_fd->fd_cdir = NULL;
        p->p_fd->fd_rdir = NULL;
 
        p->p_fd->fd_cdir = NULL;
        p->p_fd->fd_rdir = NULL;
 
-
 #ifdef GPROF
        /* Initialize kernel profiling. */
        kmstartup();
 #ifdef GPROF
        /* Initialize kernel profiling. */
        kmstartup();
@@ -458,7 +506,7 @@ bsd_init()
 
        /* kick off timeout driven events by calling first time */
        thread_wakeup(&lbolt);
 
        /* kick off timeout driven events by calling first time */
        thread_wakeup(&lbolt);
-       timeout(lightning_bolt,0,hz);
+       timeout((void (*)(void *))lightning_bolt, 0, hz);
 
        bsd_autoconf();
 
 
        bsd_autoconf();
 
@@ -471,103 +519,112 @@ bsd_init()
 #if NLOOP > 0
        loopattach();                   /* XXX */
 #endif
 #if NLOOP > 0
        loopattach();                   /* XXX */
 #endif
+        
+        /* Register the built-in dlil ethernet interface family */
+       ether_family_init();
+
+       /* Call any kext code that wants to run just after network init */
+       net_init_run();
 
        vnode_pager_bootstrap();
 
        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
+
+       inittodr(0);
 
        /* Mount the root file system. */
        while( TRUE) {
                int err;
 
                setconf();
 
        /* Mount the root file system. */
        while( TRUE) {
                int err;
 
                setconf();
-               /*
-                * read the time after clock_initialize_calendar()
-                * and before nfs mount
-                */
-               microtime(&time);
+               bsd_hardclockinit = -1; /* start ticking */
 
                if (0 == (err = vfs_mountroot()))
                        break;
 
                if (0 == (err = vfs_mountroot()))
                        break;
+#if NFSCLIENT
+               if (mountroot == netboot_mountroot) {
+                       printf("cannot mount network root, errno = %d\n", err);
+                       mountroot = NULL;
+                       if (0 == (err = vfs_mountroot()))
+                               break;
+               }
+#endif
                printf("cannot mount root, errno = %d\n", err);
                boothowto |= RB_ASKNAME;
        }
 
                printf("cannot mount root, errno = %d\n", err);
                boothowto |= RB_ASKNAME;
        }
 
-       mountlist.cqh_first->mnt_flag |= MNT_ROOTFS;
+       context.vc_proc = p;
+       context.vc_ucred = p->p_ucred;
+       mountlist.tqh_first->mnt_flag |= MNT_ROOTFS;
 
        /* Get the vnode for '/'.  Set fdp->fd_fd.fd_cdir to reference it. */
 
        /* Get the vnode for '/'.  Set fdp->fd_fd.fd_cdir to reference it. */
-       if (VFS_ROOT(mountlist.cqh_first, &rootvnode))
+       if (VFS_ROOT(mountlist.tqh_first, &rootvnode, &context))
                panic("bsd_init: cannot find root vnode");
                panic("bsd_init: cannot find root vnode");
+       rootvnode->v_flag |= VROOT;
+       (void)vnode_ref(rootvnode);
+       (void)vnode_put(rootvnode);
        filedesc0.fd_cdir = rootvnode;
        filedesc0.fd_cdir = rootvnode;
-       VREF(rootvnode);
-       VOP_UNLOCK(rootvnode, 0, p);
+
+#if NFSCLIENT
+       if (mountroot == netboot_mountroot) {
+               int err;
+               /* post mount setup */
+               if (err = netboot_setup(p)) {
+                       panic("bsd_init: NetBoot could not find root, %d", err);
+               }
+       }
+#endif
        
 
        
 
-       /*
-        * Now can look at time, having had a chance to verify the time
-        * from the file system.  Reset p->p_rtime as it may have been
-        * munched in mi_switch() after the time got set.
-        */
-       p->p_stats->p_start = boottime = time;
+       microtime(&p->p_stats->p_start);
        p->p_rtime.tv_sec = p->p_rtime.tv_usec = 0;
 
        p->p_rtime.tv_sec = p->p_rtime.tv_usec = 0;
 
-#ifdef DEVFS
+#if DEVFS
        {
            extern void devfs_kernel_mount(char * str);
            
            devfs_kernel_mount("/dev");
        }
        {
            extern void devfs_kernel_mount(char * str);
            
            devfs_kernel_mount("/dev");
        }
-#endif DEVFS
+#endif /* DEVFS */
        
        /* Initialize signal state for process 0. */
        siginit(p);
 
        
        /* Initialize signal state for process 0. */
        siginit(p);
 
-       /* printf("Launching user process\n"); */
-
        bsd_utaskbootstrap();
 
        bsd_utaskbootstrap();
 
-       (void) thread_funnel_set(kernel_flock, FALSE);
+#if __i386__
+       // this should be done after the root filesystem is mounted
+       error = set_archhandler(p, CPU_TYPE_POWERPC);
+       if (error)
+               exec_archhandler_ppc.path[0] = 0;
+#endif 
+       
+       /* invoke post-root-mount hook */
+       if (mountroot_post_hook != NULL)
+               mountroot_post_hook();
+       
+       (void) thread_funnel_set(kernel_flock, funnel_state);
 }
 
 }
 
+/* Called with kernel funnel held */
 void
 void
-bsdinit_task()
+bsdinit_task(void)
 {
        struct proc *p = current_proc();
        struct uthread *ut;
        kern_return_t   kr;
 {
        struct proc *p = current_proc();
        struct uthread *ut;
        kern_return_t   kr;
-       thread_act_t th_act;
-       boolean_t funnel_state;
+       thread_t th_act;
+       shared_region_mapping_t system_region;
 
 
-       funnel_state = thread_funnel_set(kernel_flock, TRUE);
-
-#if FIXME  /* [ */
-
-       ipc_port_t      master_bootstrap_port;
-       task_t          bootstrap_task;
-       thread_act_t    bootstrap_thr_act;
-       ipc_port_t      root_device_port;
-
-       master_bootstrap_port = ipc_port_alloc_kernel();
-       if (master_bootstrap_port == IP_NULL)
-               panic("can't allocate master bootstrap port");
-       printf("setting bootstrap port \n");
-       task_set_special_port(bootstrap_task,
-                             TASK_BOOTSTRAP_PORT,
-                             ipc_port_make_send(master_bootstrap_port));
-       
-       printf("Setting exception port for the init task\n");
-       (void) task_set_exception_ports(get_threadtask(th),
-                                       EXC_MASK_ALL &
-                                       ~(EXC_MASK_SYSCALL |
-                         EXC_MASK_MACH_SYSCALL | EXC_MASK_RPC_ALERT),
-                                       ux_exception_port,
-                                       EXCEPTION_DEFAULT, 0);
-
-#endif /* FIXME  ] */
-       proc_name("init", p);
+       process_name("init", p);
 
        ux_handler_init();
 
        ux_handler_init();
-       /* port_reference(ux_exception_port);*/
 
 
-       th_act = current_act();
+       th_act = current_thread();
        (void) host_set_exception_ports(host_priv_self(),
                                        EXC_MASK_ALL & ~(EXC_MASK_SYSCALL |
                                                         EXC_MASK_MACH_SYSCALL |
        (void) host_set_exception_ports(host_priv_self(),
                                        EXC_MASK_ALL & ~(EXC_MASK_SYSCALL |
                                                         EXC_MASK_MACH_SYSCALL |
@@ -586,16 +643,20 @@ bsdinit_task()
 
 
        ut = (uthread_t)get_bsdthread_info(th_act);
 
 
        ut = (uthread_t)get_bsdthread_info(th_act);
-       ut->uu_ar0 = (void *)get_user_regs(th_act);
 
        bsd_hardclockinit = 1;  /* Start bsd hardclock */
        bsd_init_task = get_threadtask(th_act);
        init_task_failure_data[0] = 0;
 
        bsd_hardclockinit = 1;  /* Start bsd hardclock */
        bsd_init_task = get_threadtask(th_act);
        init_task_failure_data[0] = 0;
-       vm_set_shared_region(get_threadtask(th_act), system_shared_region);
+       system_region = lookup_default_shared_region(ENV_DEFAULT_ROOT, cpu_type());
+        if (system_region == NULL) {
+               shared_file_boot_time_init(ENV_DEFAULT_ROOT, cpu_type());
+       } else {
+               vm_set_shared_region(get_threadtask(th_act), system_region);
+       }
        load_init_program(p);
        load_init_program(p);
-
-       (void) thread_funnel_set(kernel_flock, FALSE);
-       
+       /* turn on app-profiling i.e. pre-heating */
+       app_profile = 1;
+       lock_trace = 1;
 }
 
 void
 }
 
 void
@@ -613,8 +674,9 @@ lightning_bolt()
        (void) thread_funnel_set(kernel_flock, FALSE);
 }
 
        (void) thread_funnel_set(kernel_flock, FALSE);
 }
 
-bsd_autoconf(){
-        extern kern_return_t IOKitBSDInit( void );
+bsd_autoconf()
+{
+       extern kern_return_t IOKitBSDInit( void );
 
        kminit();
 
 
        kminit();
 
@@ -628,20 +690,17 @@ bsd_autoconf(){
                (*pi->ps_func) (pi->ps_count);
        }
 
                (*pi->ps_func) (pi->ps_count);
        }
 
-        return( IOKitBSDInit());
+       return( IOKitBSDInit());
 }
 
 
 }
 
 
-#include <sys/disklabel.h>  // for MAXPARTITIONS
+#include <sys/disklabel.h>  /* for MAXPARTITIONS */
 
 
-setconf()
+static void
+setconf(void)
 {      
        extern kern_return_t IOFindBSDRoot( char * rootName,
                                dev_t * root, u_int32_t * flags );
 {      
        extern kern_return_t IOFindBSDRoot( char * rootName,
                                dev_t * root, u_int32_t * flags );
-
-       extern int      (*mountroot) __P((void));
-       extern int      nfs_mountroot();        /* nfs_vfsops.c */
-
        u_int32_t       flags;
        kern_return_t   err;
 
        u_int32_t       flags;
        kern_return_t   err;
 
@@ -661,28 +720,33 @@ setconf()
                flags = 0;
        }
 
                flags = 0;
        }
 
-       /* if network device then force nfs root */
+#if NFSCLIENT
        if( flags & 1 ) {
        if( flags & 1 ) {
-               printf("mounting nfs root\n");
-               mountroot = nfs_mountroot;
+               /* network device */
+               mountroot = netboot_mountroot;
        } else {
        } else {
+#endif
                /* otherwise have vfs determine root filesystem */
                mountroot = NULL;
                /* otherwise have vfs determine root filesystem */
                mountroot = NULL;
+#if NFSCLIENT
        }
        }
+#endif
 
 }
 
 bsd_utaskbootstrap()
 {
 
 }
 
 bsd_utaskbootstrap()
 {
-       thread_act_t th_act;
+       thread_t th_act;
+       struct uthread *ut;
 
 
-       th_act = (thread_act_t)cloneproc(kernproc, 0);
+       th_act = cloneproc(kernproc, 0);
        initproc = pfind(1);                            
        initproc = pfind(1);                            
-       thread_hold(th_act);
-       (void) thread_stop_wait(getshuttle_thread(th_act));
-       thread_ast_set(th_act,AST_BSD_INIT);
-       thread_release(th_act);
-       thread_unstop(getshuttle_thread(th_act));
+       /* Set the launch time for init */
+       microtime(&initproc->p_stats->p_start);
+
+       ut = (struct uthread *)get_bsdthread_info(th_act);
+       ut->uu_sigmask = 0;
+       act_set_astbsd(th_act);
        (void) thread_resume(th_act);
 }
 
        (void) thread_resume(th_act);
 }
 
@@ -704,6 +768,7 @@ parse_bsd_args()
                else
                        strcat(init_args,"-s");
        }
                else
                        strcat(init_args,"-s");
        }
+
        if (PE_parse_boot_arg("-b", namep)) {
                boothowto |= RB_NOBOOTRC;
                len = strlen(init_args);
        if (PE_parse_boot_arg("-b", namep)) {
                boothowto |= RB_NOBOOTRC;
                len = strlen(init_args);
@@ -737,68 +802,27 @@ parse_bsd_args()
                        strcat(init_args,"-x");
        }
 
                        strcat(init_args,"-x");
        }
 
+       if (PE_parse_boot_arg("-d", namep)) {
+               len = strlen(init_args);
+               if(len != 0)
+                       strcat(init_args," -d");
+               else
+                       strcat(init_args,"-d");
+       }
+
        PE_parse_boot_arg("srv", &srv);
        PE_parse_boot_arg("ncl", &ncl);
        PE_parse_boot_arg("srv", &srv);
        PE_parse_boot_arg("ncl", &ncl);
-       PE_parse_boot_arg("nbuf", &nbuf);
+       if (PE_parse_boot_arg("nbuf", &max_nbuf_headers)) 
+               customnbuf = 1;
+       PE_parse_boot_arg("kmem", &setup_kmem);
 
        return 0;
 }
 
 
        return 0;
 }
 
-boolean_t
-thread_funnel_switch(
-        int    oldfnl,
-       int     newfnl)
+#if !NFSCLIENT
+int 
+netboot_root(void)
 {
 {
-       thread_t        cur_thread;
-       boolean_t       funnel_state_prev;
-       int curfnl;
-       funnel_t * curflock;
-       funnel_t * oldflock;
-       funnel_t * newflock;
-       funnel_t * exist_funnel;
-       extern int disable_funnel;
-       
-        
-               if (disable_funnel)
-                       return(TRUE);
-
-        if(oldfnl == newfnl) {
-            panic("thread_funnel_switch: can't switch to same funnel");
-        }
-        
-        if ((oldfnl != NETWORK_FUNNEL) && (oldfnl != KERNEL_FUNNEL))
-        {
-            panic("thread_funnel_switch: invalid oldfunnel");
-        }
-        if ((newfnl != NETWORK_FUNNEL) && (newfnl != KERNEL_FUNNEL))
-        {
-            panic("thread_funnel_switch: invalid oldfunnel");
-        }
-        
-       if((curflock = thread_funnel_get()) == THR_FUNNEL_NULL) {
-            panic("thread_funnel_switch: no funnel held");
-       }
-        
-       cur_thread = current_thread();
-        
-        if ((oldfnl == NETWORK_FUNNEL) && (curflock != network_flock))
-            panic("thread_funnel_switch: network funnel not held");
-            
-        if ((oldfnl == KERNEL_FUNNEL) && (curflock != kernel_flock))
-            panic("thread_funnel_switch: network funnel not held");
-
-        if(oldfnl == NETWORK_FUNNEL) {
-            oldflock = network_flock;
-            newflock = kernel_flock;
-        } else {
-            oldflock = kernel_flock;
-            newflock = network_flock;
-        }
-               KERNEL_DEBUG(0x603242c | DBG_FUNC_NONE, oldflock, 1, 0, 0, 0);
-        thread_funnel_set(oldflock, FALSE);
-               KERNEL_DEBUG(0x6032428 | DBG_FUNC_NONE, newflock, 1, 0, 0, 0);
-        thread_funnel_set(newflock, TRUE);
-               KERNEL_DEBUG(0x6032434 | DBG_FUNC_NONE, newflock, 1, 0, 0, 0);
-
-        return(TRUE);        
+       return(0);
 }
 }
+#endif