 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_descrip.c,v 1.206 2010/09/01 15:15:18 pooka Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.207 2010/10/29 15:32:23 pooka Exp $	*/
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -60,27 +60,27 @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_descrip.c	8.8 (Berkeley) 2/14/95
  */
 /*
  * File descriptor management.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.206 2010/09/01 15:15:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.207 2010/10/29 15:32:23 pooka Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/pool.h>
 @@ -1329,27 +1329,26 @@ fd_share(struct proc *p2)
 	fdp = curlwp->l_fd;
 	p2->p_fd = fdp;
 	atomic_inc_uint(&fdp->fd_refcnt);
+}
 /*
  * Acquire a hold on a filedesc structure.
  */
 void
 fd_hold(lwp_t *l)
+{
 	filedesc_t *fdp = l->l_fd;
 	KASSERT(fdp == curlwp->l_fd || fdp == lwp0.l_fd);
 	atomic_inc_uint(&fdp->fd_refcnt);
+}
 /*
  * Copy a filedesc structure.
  */
 filedesc_t *
 fd_copy(void)
+{
 	filedesc_t *newfdp, *fdp;
 	fdfile_t *ff, **ffp, **nffp, *ff2;
 	int i, j, numfiles, lastfile, newlast;
 	file_t *fp;

 @@ -1,14 +1,14 @@
-/*      $NetBSD: lwproc.c,v 1.2 2010/09/01 21:16:56 pooka Exp $	*/
+/*      $NetBSD: lwproc.c,v 1.3 2010/10/29 15:32:24 pooka Exp $	*/
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.2 2010/09/01 21:16:56 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.3 2010/10/29 15:32:24 pooka Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/filedesc.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/lwp.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/resourcevar.h>
 #include <sys/uidinfo.h>
 @@ -212,36 +212,40 @@ lwproc_makelwp(struct proc *p, struct lw
+	}
 	/* filedesc already has refcount 1 when process is created */
 	if (!procmake) {
 		fd_hold(l);
+	}
 	mutex_enter(proc_lock);
 	LIST_INSERT_HEAD(&alllwp, l, l_list);
 	mutex_exit(proc_lock);
+}
 struct lwp *
-rump__lwproc_allockernlwp(void)
+rump__lwproc_alloclwp(struct proc *p)
+{
 	struct proc *p;
 	struct lwp *l;
 	bool newproc = false;
 	if (p == NULL) {
 		p = lwproc_newproc(&proc0);
 		newproc = true;
+	}
 	l = kmem_zalloc(sizeof(*l), KM_SLEEP);
 	p = &proc0;
 	mutex_enter(p->p_lock);
-	lwproc_makelwp(p, l, false, false);
+	lwproc_makelwp(p, l, false, newproc);
 	return l;
+}
 int
 rump_lwproc_newlwp(pid_t pid)
+{
 	struct proc *p;
 	struct lwp *l;
 	l = kmem_zalloc(sizeof(*l), KM_SLEEP);
 	mutex_enter(proc_lock);
 	p = proc_find_raw(pid);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump.c,v 1.192 2010/10/28 11:30:07 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.193 2010/10/29 15:32:24 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -18,27 +18,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.192 2010/10/28 11:30:07 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.193 2010/10/29 15:32:24 pooka Exp $");
 #include <sys/systm.h>
 #define ELFSIZE ARCH_ELFSIZE
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 #include <sys/event.h>
 @@ -76,28 +76,27 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.1
 #include <prop/proplib.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_readahead.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 #include "rump_vfs_private.h"
 #include "rump_dev_private.h"
 char machine[] = MACHINE;
-/* pretend the master rump proc is init */
+struct proc *initproc;
 struct proc *initproc = &proc0;
 struct rumpuser_mtx *rump_giantlock;
 struct device rump_rootdev = {
 	.dv_class = DV_VIRTUAL
 };
 #ifdef RUMP_WITHOUT_THREADS
 int rump_threads = 0;
 #else
 int rump_threads = 1;
 #endif
 @@ -312,29 +311,30 @@ rump__init(int rump_version)
 	procinit();
 	proc0_init();
 	uid_init();
 	chgproccnt(0, 1);
 	l->l_proc = &proc0;
 	lwp_update_creds(l);
 	lwpinit_specificdata();
 	lwp_initspecific(&lwp0);
 	rump_scheduler_init(numcpu);
-	/* revert temporary context and schedule a real context */
+	/* revert temporary context and schedule a semireal context */
 	l->l_cpu = NULL;
 	rumpuser_set_curlwp(NULL);
 	initproc = &proc0; /* borrow proc0 before we get initproc started */
 	rump_schedule();
 	percpu_init();
 	inittimecounter();
 	ntp_init();
 	rumpuser_gettime(&sec, &nsec, &error);
 	ts.tv_sec = sec;
 	ts.tv_nsec = nsec;
 	tc_setclock(&ts);
 	/* we are mostly go.  do per-cpu subsystem init */
 	for (i = 0; i < numcpu; i++) {
 @@ -397,26 +397,38 @@ rump__init(int rump_version)
 	sysctl_finalize();
 	module_init_class(MODULE_CLASS_ANY);
 	rumpuser_gethostname(hostname, MAXHOSTNAMELEN, &error);
 	hostnamelen = strlen(hostname);
 	sigemptyset(&sigcantmask);
 	if (rump_threads)
 		vmem_rehash_start();
 	/*
 	 * Create init, used to attach implicit threads in rump.
 	 * (note: must be done after vfsinit to get cwdi)
 	 */
 	(void)rump__lwproc_alloclwp(NULL); /* dummy thread for initproc */
 	mutex_enter(proc_lock);
 	initproc = proc_find_raw(1);
 	mutex_exit(proc_lock);
 	if (initproc == NULL)
 		panic("where in the world is initproc?");
 	/* release cpu */
 	rump_unschedule();
 	return 0;
+}
 /* maybe support sys_reboot some day for remote shutdown */
 void
 rump_reboot(int howto)
+{
 	/* dump means we really take the dive here */
 	if ((howto & RB_DUMP) || panicstr) {
 		rumpuser_exit(RUMPUSER_PANIC);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump_private.h,v 1.59 2010/10/27 20:44:49 pooka Exp $	*/
+/*	$NetBSD: rump_private.h,v 1.60 2010/10/29 15:32:24 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -95,27 +95,27 @@ int		rump_component_count(enum rump_comp
 void		rump_gettime(struct timespec *);
 void		rump_getuptime(struct timespec *);
 void		rump_set_vmspace(struct vmspace *);
 typedef void	(*rump_proc_vfs_init_fn)(struct proc *);
 typedef void	(*rump_proc_vfs_release_fn)(struct proc *);
 extern rump_proc_vfs_init_fn rump_proc_vfs_init;
 extern rump_proc_vfs_release_fn rump_proc_vfs_release;
 extern struct cpu_info *rump_cpu;
-struct lwp *	rump__lwproc_allockernlwp(void);
+struct lwp *	rump__lwproc_alloclwp(struct proc *);
 void	rump_cpus_bootstrap(int);
 void	rump_scheduler_init(int);
 void	rump_schedule(void);
 void	rump_unschedule(void);
 void 	rump_schedule_cpu(struct lwp *);
 void 	rump_schedule_cpu_interlock(struct lwp *, void *);
 void	rump_unschedule_cpu(struct lwp *);
 void	rump_unschedule_cpu_interlock(struct lwp *, void *);
 void	rump_unschedule_cpu1(struct lwp *, void *);
 void	rump_schedlock_cv_wait(struct rumpuser_cv *);
 int	rump_schedlock_cv_timedwait(struct rumpuser_cv *,

 @@ -1,14 +1,14 @@
-/*      $NetBSD: scheduler.c,v 1.20 2010/09/07 07:59:48 pooka Exp $	*/
+/*      $NetBSD: scheduler.c,v 1.21 2010/10/29 15:32:24 pooka Exp $	*/
 /*
  * Copyright (c) 2010 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -16,27 +16,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.20 2010/09/07 07:59:48 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scheduler.c,v 1.21 2010/10/29 15:32:24 pooka Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/queue.h>
 #include <sys/select.h>
 #include <sys/systm.h>
 #include <rump/rumpuser.h>
 @@ -226,27 +226,27 @@ rump_schedule()
 	 * start a real thread.
 	 */
 	if (__predict_true((l = rumpuser_get_curlwp()) != NULL)) {
 		rump_schedule_cpu(l);
 		LWP_CACHE_CREDS(l, l->l_proc);
 	} else {
 		lwp0busy();
 		/* schedule cpu and use lwp0 */
 		rump_schedule_cpu(&lwp0);
 		rumpuser_set_curlwp(&lwp0);
 		/* allocate thread, switch to it, and release lwp0 */
-		l = rump__lwproc_allockernlwp();
+		l = rump__lwproc_alloclwp(initproc);
 		rump_lwproc_switch(l);
 		lwp0rele();
 		/*
 		 * mark new thread dead-on-unschedule.  this
 		 * means that we'll be running with l_refcnt == 0.
 		 * relax, it's fine.
 		 */
 		rump_lwproc_releaselwp();
+	}
+}
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: threads.c,v 1.12 2010/09/01 19:37:59 pooka Exp $	*/
+/*	$NetBSD: threads.c,v 1.13 2010/10/29 15:32:24 pooka Exp $	*/
 /*
  * Copyright (c) 2007-2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by
  * The Finnish Cultural Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: threads.c,v 1.12 2010/09/01 19:37:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: threads.c,v 1.13 2010/10/29 15:32:24 pooka Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
 #include <machine/stdarg.h>
 #include <rump/rumpuser.h>
 #include "rump_private.h"
 @@ -129,27 +129,27 @@ kthread_create(pri_t pri, int flags, str
 			return 0;
 		} else if (strncmp(thrstore, "xcall", sizeof("xcall")-1) == 0) {
 			printf("rump warning: threads not enabled, CPU xcall"
 			   " not functional\n");
 			return 0;
 		} else
 			panic("threads not available, setenv RUMP_THREADS 1");
+	}
 	KASSERT(fmt != NULL);
 	k = malloc(sizeof(*k), M_TEMP, M_WAITOK);
 	k->f = func;
 	k->arg = arg;
-	k->mylwp = l = rump__lwproc_allockernlwp();
+	k->mylwp = l = rump__lwproc_alloclwp(&proc0);
 	l->l_flag |= LW_SYSTEM;
 	if (flags & KTHREAD_MPSAFE)
 		l->l_pflag |= LP_MPSAFE;
 	if (flags & KTHREAD_INTR)
 		l->l_pflag |= LP_INTR;
 	if (ci) {
 		l->l_pflag |= LP_BOUND;
 		l->l_target_cpu = ci;
+	}
 	if (thrname) {
 		l->l_name = kmem_alloc(MAXCOMLEN, KM_SLEEP);
 		strlcpy(l->l_name, thrname, MAXCOMLEN);
+	}