 @@ -1,314 +1,318 @@
-/*	$NetBSD: kern_lock.c,v 1.158 2017/01/26 04:11:56 christos Exp $	*/
+/*	$NetBSD: kern_lock.c,v 1.158.6.1 2017/11/30 14:40:46 martin Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and 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.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS 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 FOUNDATION 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: kern_lock.c,v 1.158 2017/01/26 04:11:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.158.6.1 2017/11/30 14:40:46 martin Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/lock.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lockdebug.h>
 #include <sys/cpu.h>
 #include <sys/syslog.h>
 #include <sys/atomic.h>
 #include <sys/lwp.h>
 #include <sys/pserialize.h>
 #include <machine/lock.h>
 #include <dev/lockstat.h>
 #define	RETURN_ADDRESS	(uintptr_t)__builtin_return_address(0)
 bool	kernel_lock_dodebug;
 __cpu_simple_lock_t kernel_lock[CACHE_LINE_SIZE / sizeof(__cpu_simple_lock_t)]
     __cacheline_aligned;
 void
 assert_sleepable(void)
+{
 	const char *reason;
 	uint64_t pctr;
 	bool idle;
 	if (panicstr != NULL) {
 		return;
+	}
 	LOCKDEBUG_BARRIER(kernel_lock, 1);
 	/*
 	 * Avoid disabling/re-enabling preemption here since this
 	 * routine may be called in delicate situations.
 	 */
 	do {
 		pctr = lwp_pctr();
 		idle = CURCPU_IDLE_P();
 	} while (pctr != lwp_pctr());
 	reason = NULL;
 	if (idle && !cold &&
 	    kcpuset_isset(kcpuset_running, cpu_index(curcpu()))) {
 		reason = "idle";
+	}
 	if (cpu_intr_p()) {
 		reason = "interrupt";
+	}
 	if (cpu_softintr_p()) {
 		reason = "softint";
+	}
 	if (!pserialize_not_in_read_section()) {
 		reason = "pserialize";
+	}
 	if (reason) {
 		panic("%s: %s caller=%p", __func__, reason,
 		    (void *)RETURN_ADDRESS);
+	}
+}
 /*
  * Functions for manipulating the kernel_lock.  We put them here
  * so that they show up in profiles.
  */
 #define	_KERNEL_LOCK_ABORT(msg)						\
     LOCKDEBUG_ABORT(__func__, __LINE__, kernel_lock, &_kernel_lock_ops, msg)
 #ifdef LOCKDEBUG
 #define	_KERNEL_LOCK_ASSERT(cond)					\
 do {									\
 	if (!(cond))							\
 		_KERNEL_LOCK_ABORT("assertion failed: " #cond);		\
 } while (/* CONSTCOND */ 0)
 #else
 #define	_KERNEL_LOCK_ASSERT(cond)	/* nothing */
 #endif
 void	_kernel_lock_dump(volatile void *);
 lockops_t _kernel_lock_ops = {
 	"Kernel lock",
 	LOCKOPS_SPIN,
 	_kernel_lock_dump
 };
 /*
  * Initialize the kernel lock.
  */
 void
 kernel_lock_init(void)
+{
 	__cpu_simple_lock_init(kernel_lock);
 	kernel_lock_dodebug = LOCKDEBUG_ALLOC(kernel_lock, &_kernel_lock_ops,
 	    RETURN_ADDRESS);
+}
 CTASSERT(CACHE_LINE_SIZE >= sizeof(__cpu_simple_lock_t));
 /*
  * Print debugging information about the kernel lock.
  */
 void
 _kernel_lock_dump(volatile void *junk)
+{
 	struct cpu_info *ci = curcpu();
 	(void)junk;
 	printf_nolog("curcpu holds : %18d wanted by: %#018lx\n",
 	    ci->ci_biglock_count, (long)ci->ci_biglock_wanted);
+}
 /*
  * Acquire 'nlocks' holds on the kernel lock.
  */
 void
 _kernel_lock(int nlocks)
+{
 	struct cpu_info *ci;
 	LOCKSTAT_TIMER(spintime);
 	LOCKSTAT_FLAG(lsflag);
 	struct lwp *owant;
 	u_int spins;
 	int s;
 	struct lwp *l = curlwp;
 	_KERNEL_LOCK_ASSERT(nlocks > 0);
 	s = splvm();
 	ci = curcpu();
 	if (ci->ci_biglock_count != 0) {
 		_KERNEL_LOCK_ASSERT(__SIMPLELOCK_LOCKED_P(kernel_lock));
 		ci->ci_biglock_count += nlocks;
 		l->l_blcnt += nlocks;
 		splx(s);
 		return;
+	}
 	_KERNEL_LOCK_ASSERT(l->l_blcnt == 0);
 	LOCKDEBUG_WANTLOCK(kernel_lock_dodebug, kernel_lock, RETURN_ADDRESS,
 );
 	if (__cpu_simple_lock_try(kernel_lock)) {
 		ci->ci_biglock_count = nlocks;
 		l->l_blcnt = nlocks;
 		LOCKDEBUG_LOCKED(kernel_lock_dodebug, kernel_lock, NULL,
 		    RETURN_ADDRESS, 0);
 		splx(s);
 		return;
+	}
 	/*
 	 * To remove the ordering constraint between adaptive mutexes
 	 * and kernel_lock we must make it appear as if this thread is
 	 * blocking.  For non-interlocked mutex release, a store fence
 	 * is required to ensure that the result of any mutex_exit()
 	 * by the current LWP becomes visible on the bus before the set
 	 * of ci->ci_biglock_wanted becomes visible.
 	 */
 	membar_producer();
 	owant = ci->ci_biglock_wanted;
 	ci->ci_biglock_wanted = l;
 	/*
 	 * Spin until we acquire the lock.  Once we have it, record the
 	 * time spent with lockstat.
 	 */
 	LOCKSTAT_ENTER(lsflag);
 	LOCKSTAT_START_TIMER(lsflag, spintime);
 	spins = 0;
 	do {
 		splx(s);
 		while (__SIMPLELOCK_LOCKED_P(kernel_lock)) {
 			if (SPINLOCK_SPINOUT(spins)) {
 				extern int start_init_exec;
 				if (!start_init_exec)
 					_KERNEL_LOCK_ABORT("spinout");
+			}
 			SPINLOCK_BACKOFF_HOOK;
 			SPINLOCK_SPIN_HOOK;
+		}
 		s = splvm();
 	} while (!__cpu_simple_lock_try(kernel_lock));
 	ci->ci_biglock_count = nlocks;
 	l->l_blcnt = nlocks;
 	LOCKSTAT_STOP_TIMER(lsflag, spintime);
 	LOCKDEBUG_LOCKED(kernel_lock_dodebug, kernel_lock, NULL,
 	    RETURN_ADDRESS, 0);
 	if (owant == NULL) {
 		LOCKSTAT_EVENT_RA(lsflag, kernel_lock,
 		    LB_KERNEL_LOCK | LB_SPIN, 1, spintime, RETURN_ADDRESS);
+	}
 	LOCKSTAT_EXIT(lsflag);
 	splx(s);
 	/*
 	 * Now that we have kernel_lock, reset ci_biglock_wanted.  This
 	 * store must be unbuffered (immediately visible on the bus) in
 	 * order for non-interlocked mutex release to work correctly.
 	 * It must be visible before a mutex_exit() can execute on this
 	 * processor.
+	 *
 	 * Note: only where CAS is available in hardware will this be
 	 * an unbuffered write, but non-interlocked release cannot be
 	 * done on CPUs without CAS in hardware.
 	 */
 	(void)atomic_swap_ptr(&ci->ci_biglock_wanted, owant);
 	/*
 	 * Issue a memory barrier as we have acquired a lock.  This also
 	 * prevents stores from a following mutex_exit() being reordered
 	 * to occur before our store to ci_biglock_wanted above.
 	 */
 	membar_enter();
+}
 /*
  * Release 'nlocks' holds on the kernel lock.  If 'nlocks' is zero, release
  * all holds.
  */
 void
 _kernel_unlock(int nlocks, int *countp)
+{
 	struct cpu_info *ci;
 	u_int olocks;
 	int s;
 	struct lwp *l = curlwp;
 	_KERNEL_LOCK_ASSERT(nlocks < 2);
 	olocks = l->l_blcnt;
 	if (olocks == 0) {
 		_KERNEL_LOCK_ASSERT(nlocks <= 0);
 		if (countp != NULL)
 			*countp = 0;
 		return;
+	}
 	_KERNEL_LOCK_ASSERT(__SIMPLELOCK_LOCKED_P(kernel_lock));
 	if (nlocks == 0)
 		nlocks = olocks;
 	else if (nlocks == -1) {
 		nlocks = 1;
 		_KERNEL_LOCK_ASSERT(olocks == 1);
+	}
 	s = splvm();
 	ci = curcpu();
 	_KERNEL_LOCK_ASSERT(ci->ci_biglock_count >= l->l_blcnt);
 	if (ci->ci_biglock_count == nlocks) {
 		LOCKDEBUG_UNLOCKED(kernel_lock_dodebug, kernel_lock,
 		    RETURN_ADDRESS, 0);
 		ci->ci_biglock_count = 0;
 		__cpu_simple_unlock(kernel_lock);
 		l->l_blcnt -= nlocks;
 		splx(s);
 		if (l->l_dopreempt)
 			kpreempt(0);
 	} else {
 		ci->ci_biglock_count -= nlocks;
 		l->l_blcnt -= nlocks;
 		splx(s);
+	}
 	if (countp != NULL)
 		*countp = olocks;
+}
 bool
 _kernel_locked_p(void)
+{
 	return __SIMPLELOCK_LOCKED_P(kernel_lock);
+}

 @@ -1,263 +1,355 @@
-/*	$NetBSD: subr_pserialize.c,v 1.8 2015/06/12 19:18:30 dholland Exp $	*/
+/*	$NetBSD: subr_pserialize.c,v 1.8.10.1 2017/11/30 14:40:46 martin Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS 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 FOUNDATION 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.
  */
 /*
  * Passive serialization.
+ *
  * Implementation accurately matches the lapsed US patent 4809168, therefore
  * code is patent-free in the United States.  Your use of this code is at
  * your own risk.
+ *
  * Note for NetBSD developers: all changes to this source file must be
  * approved by the <core>.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pserialize.c,v 1.8 2015/06/12 19:18:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pserialize.c,v 1.8.10.1 2017/11/30 14:40:46 martin Exp $");
 #include <sys/param.h>
 #include <sys/condvar.h>
 #include <sys/cpu.h>
 #include <sys/evcnt.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/pserialize.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/xcall.h>
 struct pserialize {
 	TAILQ_ENTRY(pserialize)	psz_chain;
 	lwp_t *			psz_owner;
 	kcpuset_t *		psz_target;
 	kcpuset_t *		psz_pass;
 };
 static u_int			psz_work_todo	__cacheline_aligned;
 static kmutex_t			psz_lock	__cacheline_aligned;
 static struct evcnt		psz_ev_excl	__cacheline_aligned;
 /*
  * As defined in "Method 1":
  *	q0: "0 MP checkpoints have occured".
  *	q1: "1 MP checkpoint has occured".
  *	q2: "2 MP checkpoints have occured".
  */
 static TAILQ_HEAD(, pserialize)	psz_queue0	__cacheline_aligned;
 static TAILQ_HEAD(, pserialize)	psz_queue1	__cacheline_aligned;
 static TAILQ_HEAD(, pserialize)	psz_queue2	__cacheline_aligned;
 #ifdef LOCKDEBUG
 #include <sys/percpu.h>
 static percpu_t		*psz_debug_nreads	__cacheline_aligned;
 #endif
 /*
  * pserialize_init:
+ *
  *	Initialize passive serialization structures.
  */
 void
 pserialize_init(void)
+{
 	psz_work_todo = 0;
 	TAILQ_INIT(&psz_queue0);
 	TAILQ_INIT(&psz_queue1);
 	TAILQ_INIT(&psz_queue2);
 	mutex_init(&psz_lock, MUTEX_DEFAULT, IPL_SCHED);
 	evcnt_attach_dynamic(&psz_ev_excl, EVCNT_TYPE_MISC, NULL,
 	    "pserialize", "exclusive access");
 #ifdef LOCKDEBUG
 	psz_debug_nreads = percpu_alloc(sizeof(uint32_t));
 #endif
+}
 /*
  * pserialize_create:
+ *
  *	Create and initialize a passive serialization object.
  */
 pserialize_t
 pserialize_create(void)
+{
 	pserialize_t psz;
 	psz = kmem_zalloc(sizeof(struct pserialize), KM_SLEEP);
 	kcpuset_create(&psz->psz_target, true);
 	kcpuset_create(&psz->psz_pass, true);
 	psz->psz_owner = NULL;
 	return psz;
+}
 /*
  * pserialize_destroy:
+ *
  *	Destroy a passive serialization object.
  */
 void
 pserialize_destroy(pserialize_t psz)
+{
 	KASSERT(psz->psz_owner == NULL);
 	kcpuset_destroy(psz->psz_target);
 	kcpuset_destroy(psz->psz_pass);
 	kmem_free(psz, sizeof(struct pserialize));
+}
 /*
  * pserialize_perform:
+ *
  *	Perform the write side of passive serialization.  The calling
  *	thread holds an exclusive lock on the data object(s) being updated.
  *	We wait until every processor in the system has made at least two
  *	passes through cpu_switchto().  The wait is made with the caller's
  *	update lock held, but is short term.
  */
 void
 pserialize_perform(pserialize_t psz)
+{
 	uint64_t xc;
 	KASSERT(!cpu_intr_p());
 	KASSERT(!cpu_softintr_p());
 	if (__predict_false(panicstr != NULL)) {
 		return;
+	}
 	KASSERT(psz->psz_owner == NULL);
 	KASSERT(ncpu > 0);
 	/*
 	 * Set up the object and put it onto the queue.  The lock
 	 * activity here provides the necessary memory barrier to
 	 * make the caller's data update completely visible to
 	 * other processors.
 	 */
 	psz->psz_owner = curlwp;
 	kcpuset_copy(psz->psz_target, kcpuset_running);
 	kcpuset_zero(psz->psz_pass);
 	mutex_spin_enter(&psz_lock);
 	TAILQ_INSERT_TAIL(&psz_queue0, psz, psz_chain);
 	psz_work_todo++;
 	do {
 		mutex_spin_exit(&psz_lock);
 		/*
 		 * Force some context switch activity on every CPU, as
 		 * the system may not be busy.  Pause to not flood.
 		 */
 		xc = xc_broadcast(XC_HIGHPRI, (xcfunc_t)nullop, NULL, NULL);
 		xc_wait(xc);
 		kpause("psrlz", false, 1, NULL);
 		mutex_spin_enter(&psz_lock);
 	} while (!kcpuset_iszero(psz->psz_target));
 	psz_ev_excl.ev_count++;
 	mutex_spin_exit(&psz_lock);
 	psz->psz_owner = NULL;
+}
 int
 pserialize_read_enter(void)
+{
 	int s;
 	KASSERT(!cpu_intr_p());
-	return splsoftserial();
+	s = splsoftserial();
 #ifdef LOCKDEBUG
+	{
 		uint32_t *nreads;
 		nreads = percpu_getref(psz_debug_nreads);
 		(*nreads)++;
 		if (*nreads == 0)
 			panic("nreads overflow");
 		percpu_putref(psz_debug_nreads);
+	}
 #endif
 	return s;
+}
 void
 pserialize_read_exit(int s)
+{
 #ifdef LOCKDEBUG
+	{
 		uint32_t *nreads;
 		nreads = percpu_getref(psz_debug_nreads);
 		(*nreads)--;
 		if (*nreads == UINT_MAX)
 			panic("nreads underflow");
 		percpu_putref(psz_debug_nreads);
+	}
 #endif
 	splx(s);
+}
 /*
  * pserialize_switchpoint:
+ *
  *	Monitor system context switch activity.  Called from machine
  *	independent code after mi_switch() returns.
  */
 void
 pserialize_switchpoint(void)
+{
 	pserialize_t psz, next;
 	cpuid_t cid;
 	/* We must to ensure not to come here from inside a read section. */
 	KASSERT(pserialize_not_in_read_section());
 	/*
 	 * If no updates pending, bail out.  No need to lock in order to
 	 * test psz_work_todo; the only ill effect of missing an update
 	 * would be to delay LWPs waiting in pserialize_perform().  That
 	 * will not happen because updates are on the queue before an
 	 * xcall is generated (serialization) to tickle every CPU.
 	 */
 	if (__predict_true(psz_work_todo == 0)) {
 		return;
+	}
 	mutex_spin_enter(&psz_lock);
 	cid = cpu_index(curcpu());
 	/*
 	 * At first, scan through the second queue and update each request,
 	 * if passed all processors, then transfer to the third queue.
 	 */
 	for (psz = TAILQ_FIRST(&psz_queue1); psz != NULL; psz = next) {
 		next = TAILQ_NEXT(psz, psz_chain);
 		kcpuset_set(psz->psz_pass, cid);
 		if (!kcpuset_match(psz->psz_pass, psz->psz_target)) {
 			continue;
+		}
 		kcpuset_zero(psz->psz_pass);
 		TAILQ_REMOVE(&psz_queue1, psz, psz_chain);
 		TAILQ_INSERT_TAIL(&psz_queue2, psz, psz_chain);
+	}
 	/*
 	 * Scan through the first queue and update each request,
 	 * if passed all processors, then move to the second queue.
 	 */
 	for (psz = TAILQ_FIRST(&psz_queue0); psz != NULL; psz = next) {
 		next = TAILQ_NEXT(psz, psz_chain);
 		kcpuset_set(psz->psz_pass, cid);
 		if (!kcpuset_match(psz->psz_pass, psz->psz_target)) {
 			continue;
+		}
 		kcpuset_zero(psz->psz_pass);
 		TAILQ_REMOVE(&psz_queue0, psz, psz_chain);
 		TAILQ_INSERT_TAIL(&psz_queue1, psz, psz_chain);
+	}
 	/*
 	 * Process the third queue: entries have been seen twice on every
 	 * processor, remove from the queue and notify the updating thread.
 	 */
 	while ((psz = TAILQ_FIRST(&psz_queue2)) != NULL) {
 		TAILQ_REMOVE(&psz_queue2, psz, psz_chain);
 		kcpuset_zero(psz->psz_target);
 		psz_work_todo--;
+	}
 	mutex_spin_exit(&psz_lock);
+}
 /*
  * pserialize_in_read_section:
+ *
  *   True if the caller is in a pserialize read section.  To be used only
  *   for diagnostic assertions where we want to guarantee the condition like:
+ *
  *     KASSERT(pserialize_in_read_section());
  */
 bool
 pserialize_in_read_section(void)
+{
 #ifdef LOCKDEBUG
 	uint32_t *nreads;
 	bool in;
 	/* Not initialized yet */
 	if (__predict_false(psz_debug_nreads == NULL))
 		return true;
 	nreads = percpu_getref(psz_debug_nreads);
 	in = *nreads != 0;
 	percpu_putref(psz_debug_nreads);
 	return in;
 #else
 	return true;
 #endif
+}
 /*
  * pserialize_not_in_read_section:
+ *
  *   True if the caller is not in a pserialize read section.  To be used only
  *   for diagnostic assertions where we want to guarantee the condition like:
+ *
  *     KASSERT(pserialize_not_in_read_section());
  */
 bool
 pserialize_not_in_read_section(void)
+{
 #ifdef LOCKDEBUG
 	uint32_t *nreads;
 	bool notin;
 	/* Not initialized yet */
 	if (__predict_false(psz_debug_nreads == NULL))
 		return true;
 	nreads = percpu_getref(psz_debug_nreads);
 	notin = *nreads == 0;
 	percpu_putref(psz_debug_nreads);
 	return notin;
 #else
 	return true;
 #endif
+}

 @@ -1,380 +1,393 @@
-/*	$NetBSD: emul.c,v 1.181.6.1 2017/06/04 20:35:01 bouyer Exp $	*/
+/*	$NetBSD: emul.c,v 1.181.6.2 2017/11/30 14:40:46 martin Exp $	*/
 /*
  * Copyright (c) 2007-2011 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * 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: emul.c,v 1.181.6.1 2017/06/04 20:35:01 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emul.c,v 1.181.6.2 2017/11/30 14:40:46 martin Exp $");
 #include <sys/param.h>
 #include <sys/cprng.h>
 #include <sys/filedesc.h>
 #include <sys/fstrans.h>
 #include <sys/kauth.h>
 #include <sys/module.h>
 #include <sys/reboot.h>
 #include <sys/syscall.h>
 #include <sys/pserialize.h>
 #ifdef LOCKDEBUG
 #include <sys/sleepq.h>
 #endif
 #include <dev/cons.h>
 #include <rump-sys/kern.h>
 #include <rump/rumpuser.h>
 void (*rump_vfs_fini)(void) = (void *)nullop;
 /*
  * physmem is largely unused (except for nmbcluster calculations),
  * so pick a default value which suits ZFS.  if an application wants
  * a very small memory footprint, it can still adjust this before
  * calling rump_init()
  */
 #define PHYSMEM 512*256
 psize_t physmem = PHYSMEM;
 int nkmempages = PHYSMEM/2; /* from le chapeau */
 #undef PHYSMEM
 struct vnode *rootvp;
 dev_t rootdev = NODEV;
 const int schedppq = 1;
 bool mp_online = false;
 struct timespec boottime;
 int cold = 1;
 int boothowto = AB_SILENT;
 struct tty *constty;
 const struct bdevsw *bdevsw0[255];
 const struct bdevsw **bdevsw = bdevsw0;
 const int sys_cdevsws = 255;
 int max_cdevsws = 255;
 const struct cdevsw *cdevsw0[255];
 const struct cdevsw **cdevsw = cdevsw0;
 const int sys_bdevsws = 255;
 int max_bdevsws = 255;
 int mem_no = 2;
 device_t booted_device;
 device_t booted_wedge;
 int booted_partition;
 /* XXX: unused */
 kmutex_t tty_lock;
 krwlock_t exec_lock;
 /* sparc doesn't sport constant page size, pretend we have 4k pages */
 #ifdef __sparc__
 int nbpg = 4096;
 int pgofset = 4096-1;
 int pgshift = 12;
 #endif
 /* on sun3 VM_MAX_ADDRESS is a const variable */
 /* XXX: should be moved into rump.c and initialize for sun3 and sun3x? */
 #ifdef sun3
 const vaddr_t kernbase = KERNBASE3;
 #endif
 struct loadavg averunnable = {
 	{ 0 * FSCALE,
 * FSCALE,
 * FSCALE, },
 	FSCALE,
 };
 /*
  * Include the autogenerated list of auto-loadable syscalls
  */
 #include <kern/syscalls_autoload.c>
 struct emul emul_netbsd = {
 	.e_name = "netbsd-rump",
 	.e_sysent = rump_sysent,
 #ifndef __HAVE_MINIMAL_EMUL
 	.e_nsysent = SYS_NSYSENT,
 #endif
 	.e_vm_default_addr = uvm_default_mapaddr,
 #ifdef __HAVE_SYSCALL_INTERN
 	.e_syscall_intern = syscall_intern,
 #endif
 	.e_sc_autoload = netbsd_syscalls_autoload,
 };
 cprng_strong_t *kern_cprng;
 /* not used, but need the symbols for pointer comparisons */
 syncobj_t mutex_syncobj, rw_syncobj;
 int
 kpause(const char *wmesg, bool intr, int timeo, kmutex_t *mtx)
+{
 	extern int hz;
 	int rv __diagused;
 	uint64_t sec, nsec;
 	if (mtx)
 		mutex_exit(mtx);
 	sec = timeo / hz;
 	nsec = (timeo % hz) * (1000000000 / hz);
 	rv = rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, sec, nsec);
 	KASSERT(rv == 0);
 	if (mtx)
 		mutex_enter(mtx);
 	return 0;
+}
 vaddr_t
 calc_cache_size(vsize_t vasz, int pct, int va_pct)
+{
 	paddr_t t;
 	t = (paddr_t)physmem * pct / 100 * PAGE_SIZE;
 	if ((vaddr_t)t != t) {
 		panic("%s: needs tweak", __func__);
+	}
 	return t;
+}
 #define	RETURN_ADDRESS	(uintptr_t)__builtin_return_address(0)
 void
 assert_sleepable(void)
+{
 	const char *reason = NULL;
 	/* always sleepable, although we should improve this */
 	if (!pserialize_not_in_read_section()) {
 		reason = "pserialize";
+	}
 	if (reason) {
 		panic("%s: %s caller=%p", __func__, reason,
 		    (void *)RETURN_ADDRESS);
+	}
+}
 void
 module_init_md(void)
+{
 	/*
 	 * Nothing for now.  However, we should load the librump
 	 * symbol table.
 	 */
+}
 /*
  * Try to emulate all the MD definitions of DELAY() / delay().
  * Would be nice to fix the #defines in MD headers, but this quicker.
+ *
  * XXX: we'd need a rumpuser_clock_sleep_nowrap() here.  Since we
  * don't have it in the current hypercall revision, busyloop.
  * Note that rather than calibrate a loop delay and work with that,
  * get call gettime (which does not block) in a loop to make sure
  * we didn't get virtual ghosttime.  That might be slightly inaccurate
  * for very small delays ...
+ *
  * The other option would be to run a thread in the hypervisor which
  * sleeps for us and we can wait for it using rumpuser_cv_wait_nowrap()
  * Probably too fussy.  Better just wait for hypercall rev 18 ;)
  */
 static void
 rump_delay(unsigned int us)
+{
 	struct timespec target, tmp;
 	uint64_t sec, sec_ini, sec_now;
 	long nsec, nsec_ini, nsec_now;
 	int loops;
 	rumpuser_clock_gettime(RUMPUSER_CLOCK_ABSMONO, &sec_ini, &nsec_ini);
 #ifdef __mac68k__
 	sec = us / 1000;
 	nsec = (us % 1000) * 1000000;
 #else
 	sec = us / 1000000;
 	nsec = (us % 1000000) * 1000;
 #endif
 	target.tv_sec = sec_ini;
 	tmp.tv_sec = sec;
 	target.tv_nsec = nsec_ini;
 	tmp.tv_nsec = nsec;
 	timespecadd(&target, &tmp, &target);
 	if (__predict_false(sec != 0))
 		printf("WARNING: over 1s delay\n");
 	for (loops = 0; loops < 1000*1000*100; loops++) {
 		struct timespec cur;
 		rumpuser_clock_gettime(RUMPUSER_CLOCK_ABSMONO,
 		    &sec_now, &nsec_now);
 		cur.tv_sec = sec_now;
 		cur.tv_nsec = nsec_now;
 		if (timespeccmp(&cur, &target, >=)) {
 			return;
+		}
+	}
 	printf("WARNING: DELAY ESCAPED\n");
+}
 void (*delay_func)(unsigned int) = rump_delay;
 __strong_alias(delay,rump_delay);
 __strong_alias(_delay,rump_delay);
 /* Weak aliases for fstrans to be used unless librumpvfs is present. */
 void rump_fstrans_start(struct mount *);
 void
 rump_fstrans_start(struct mount *mp)
+{
+}
 __weak_alias(fstrans_start,rump_fstrans_start);
 int rump_fstrans_start_nowait(struct mount *);
 int
 rump_fstrans_start_nowait(struct mount *mp)
+{
 	return 0;
+}
 __weak_alias(fstrans_start_nowait,rump_fstrans_start_nowait);
 void rump_fstrans_done(struct mount *);
 void
 rump_fstrans_done(struct mount *mp)
+{
+}
 __weak_alias(fstrans_done,rump_fstrans_done);
 /*
  * Provide weak aliases for tty routines used by printf.
  * They will be used unless the rumpkern_tty component is present.
  */
 int rump_ttycheckoutq(struct tty *, int);
 int
 rump_ttycheckoutq(struct tty *tp, int wait)
+{
 	return 1;
+}
 __weak_alias(ttycheckoutq,rump_ttycheckoutq);
 int rump_tputchar(int, int, struct tty *);
 int
 rump_tputchar(int c, int flags, struct tty *tp)
+{
 	cnputc(c);
 	return 0;
+}
 __weak_alias(tputchar,rump_tputchar);
 void
 cnputc(int c)
+{
 	rumpuser_putchar(c);
+}
 void
 cnflush(void)
+{
 	/* done */
+}
 void
 resettodr(void)
+{
 	/* setting clocks is not in the jurisdiction of rump kernels */
+}
 #ifdef __HAVE_SYSCALL_INTERN
 void
 syscall_intern(struct proc *p)
+{
 	p->p_emuldata = NULL;
+}
 #endif
 #ifdef LOCKDEBUG
 void
 turnstile_print(volatile void *obj, void (*pr)(const char *, ...))
+{
 	/* nada */
+}
 #endif
 void
 cpu_reboot(int howto, char *bootstr)
+{
 	int ruhow = 0;
 	void *finiarg;
 	printf("rump kernel halting...\n");
 	if (!RUMP_LOCALPROC_P(curproc))
 		finiarg = RUMP_SPVM2CTL(curproc->p_vmspace);
 	else
 		finiarg = NULL;
 	/* dump means we really take the dive here */
 	if ((howto & RB_DUMP) || panicstr) {
 		ruhow = RUMPUSER_PANIC;
 		goto out;
+	}
 	/* try to sync */
 	if (!((howto & RB_NOSYNC) || panicstr)) {
 		rump_vfs_fini();
+	}
 	doshutdownhooks();
 	/* your wish is my command */
 	if (howto & RB_HALT) {
 		printf("rump kernel halted (with RB_HALT, not exiting)\n");
 		rump_sysproxy_fini(finiarg);
 		for (;;) {
 			rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, 10, 0);
+		}
+	}
 	/* this function is __dead, we must exit */
  out:
 	rump_sysproxy_fini(finiarg);
 	rumpuser_exit(ruhow);
+}
 const char *
 cpu_getmodel(void)
+{
 	return "rumpcore (virtual)";
+}

 @@ -1,819 +1,819 @@
-/*	$NetBSD: rump.c,v 1.329 2016/03/08 14:30:48 joerg Exp $	*/
+/*	$NetBSD: rump.c,v 1.329.10.1 2017/11/30 14:40:46 martin Exp $	*/
 /*
  * Copyright (c) 2007-2011 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * 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.329 2016/03/08 14:30:48 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.329.10.1 2017/11/30 14:40:46 martin 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>
 #include <sys/exec_elf.h>
 #include <sys/filedesc.h>
 #include <sys/iostat.h>
 #include <sys/kauth.h>
 #include <sys/kcpuset.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/kprintf.h>
 #include <sys/kthread.h>
 #include <sys/ksyms.h>
 #include <sys/msgbuf.h>
 #include <sys/module.h>
 #include <sys/namei.h>
 #include <sys/once.h>
 #include <sys/percpu.h>
 #include <sys/pipe.h>
 #include <sys/pool.h>
 #include <sys/pserialize.h>
 #include <sys/queue.h>
 #include <sys/reboot.h>
 #include <sys/resourcevar.h>
 #include <sys/select.h>
 #include <sys/sysctl.h>
 #include <sys/syscall.h>
 #include <sys/syscallvar.h>
 #include <sys/timetc.h>
 #include <sys/tty.h>
 #include <sys/uidinfo.h>
 #include <sys/vmem.h>
 #include <sys/xcall.h>
 #include <sys/cprng.h>
 #include <sys/rnd.h>
 #include <sys/ktrace.h>
 #include <rump-sys/kern.h>
 #include <rump-sys/dev.h>
 #include <rump-sys/net.h>
 #include <rump-sys/vfs.h>
 #include <rump/rumpuser.h>
 #include <secmodel/suser/suser.h>
 #include <prop/proplib.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_readahead.h>
 char machine[] = MACHINE;
 char machine_arch[] = MACHINE_ARCH;
 struct proc *initproc;
 struct device rump_rootdev = {
 	.dv_class = DV_VIRTUAL
 };
 #ifdef RUMP_WITHOUT_THREADS
 int rump_threads = 0;
 #else
 int rump_threads = 1;
 #endif
 static void rump_component_addlocal(void);
 static struct lwp *bootlwp;
 /* 16k should be enough for std rump needs */
 static  char rump_msgbuf[16*1024] __aligned(256);
 bool rump_ttycomponent = false;
 static void
 rump_aiodone_worker(struct work *wk, void *dummy)
+{
 	struct buf *bp = (struct buf *)wk;
 	KASSERT(&bp->b_work == wk);
 	bp->b_iodone(bp);
+}
 static int rump_inited;
 void (*rump_vfs_drainbufs)(int) = (void *)nullop;
 int  (*rump_vfs_makeonedevnode)(dev_t, const char *,
 				devmajor_t, devminor_t) = (void *)nullop;
 int  (*rump_vfs_makedevnodes)(dev_t, const char *, char,
 			      devmajor_t, devminor_t, int) = (void *)nullop;
 int  (*rump_vfs_makesymlink)(const char *, const char *) = (void *)nullop;
 rump_proc_vfs_init_fn rump_proc_vfs_init = (void *)nullop;
 rump_proc_vfs_release_fn rump_proc_vfs_release = (void *)nullop;
 static void add_linkedin_modules(const struct modinfo *const *, size_t);
 static pid_t rspo_wrap_getpid(void) {
 	return rump_sysproxy_hyp_getpid();
+}
 static int rspo_wrap_syscall(int num, void *arg, long *retval) {
 	return rump_sysproxy_hyp_syscall(num, arg, retval);
+}
 static int rspo_wrap_rfork(void *priv, int flag, const char *comm) {
 	return rump_sysproxy_hyp_rfork(priv, flag, comm);
+}
 static void rspo_wrap_lwpexit(void) {
 	rump_sysproxy_hyp_lwpexit();
+}
 static void rspo_wrap_execnotify(const char *comm) {
 	rump_sysproxy_hyp_execnotify(comm);
+}
 static const struct rumpuser_hyperup hyp = {
 	.hyp_schedule		= rump_schedule,
 	.hyp_unschedule		= rump_unschedule,
 	.hyp_backend_unschedule	= rump_user_unschedule,
 	.hyp_backend_schedule	= rump_user_schedule,
 	.hyp_lwproc_switch	= rump_lwproc_switch,
 	.hyp_lwproc_release	= rump_lwproc_releaselwp,
 	.hyp_lwproc_newlwp	= rump_lwproc_newlwp,
 	.hyp_lwproc_curlwp	= rump_lwproc_curlwp,
 	.hyp_getpid		= rspo_wrap_getpid,
 	.hyp_syscall		= rspo_wrap_syscall,
 	.hyp_lwproc_rfork	= rspo_wrap_rfork,
 	.hyp_lwpexit		= rspo_wrap_lwpexit,
 	.hyp_execnotify		= rspo_wrap_execnotify,
 };
 struct rump_sysproxy_ops rump_sysproxy_ops = {
 	.rspo_copyin		= (void *)enxio,
 	.rspo_copyinstr 	= (void *)enxio,
 	.rspo_copyout	 	= (void *)enxio,
 	.rspo_copyoutstr 	= (void *)enxio,
 	.rspo_anonmmap 		= (void *)enxio,
 	.rspo_raise 		= (void *)enxio,
 	.rspo_fini 		= (void *)enxio,
 	.rspo_hyp_getpid 	= (void *)enxio,
 	.rspo_hyp_syscall 	= (void *)enxio,
 	.rspo_hyp_rfork 	= (void *)enxio,
 	.rspo_hyp_lwpexit 	= (void *)enxio,
 	.rspo_hyp_execnotify 	= (void *)enxio,
 };
 int
 rump_daemonize_begin(void)
+{
 	if (rump_inited)
 		return EALREADY;
 	return rumpuser_daemonize_begin();
+}
 int
 rump_daemonize_done(int error)
+{
 	return rumpuser_daemonize_done(error);
+}
 #ifdef RUMP_USE_CTOR
 /* sysctl bootstrap handling */
 struct sysctl_boot_chain sysctl_boot_chain \
     = LIST_HEAD_INITIALIZER(sysctl_boot_chain);
 __link_set_add_text(sysctl_funcs,voidop); /* ensure linkset is non-empty */
 #else /* RUMP_USE_CTOR */
 RUMP_COMPONENT(RUMP_COMPONENT_POSTINIT)
+{
 	__link_set_decl(rump_components, struct rump_component);
 	/*
 	 * Trick compiler into generating references so that statically
 	 * linked rump kernels are generated with the link set symbols.
 	 */
 	asm("" :: "r"(__start_link_set_rump_components));
 	asm("" :: "r"(__stop_link_set_rump_components));
+}
 #endif /* RUMP_USE_CTOR */
 int
 rump_init(void)
+{
 	char buf[256];
 	struct timespec ts;
 	int64_t sec;
 	long nsec;
 	struct lwp *l, *initlwp;
 	int i, numcpu;
 	/* not reentrant */
 	if (rump_inited)
 		return 0;
 	else if (rump_inited == -1)
 		panic("rump_init: host process restart required");
 	else
 		rump_inited = 1;
 	/* initialize hypervisor */
 	if (rumpuser_init(RUMPUSER_VERSION, &hyp) != 0) {
 		rumpuser_dprintf("rumpuser init failed\n");
 		return EINVAL;
+	}
 	/* init minimal lwp/cpu context */
 	rump_lwproc_init();
 	l = &lwp0;
 	l->l_cpu = l->l_target_cpu = &rump_bootcpu;
 	rump_lwproc_curlwp_set(l);
 	/* retrieve env vars which affect the early stage of bootstrap */
 	if (rumpuser_getparam("RUMP_THREADS", buf, sizeof(buf)) == 0) {
 		rump_threads = *buf != '0';
+	}
 	if (rumpuser_getparam("RUMP_VERBOSE", buf, sizeof(buf)) == 0) {
 		if (*buf != '0')
 			boothowto = AB_VERBOSE;
+	}
 	if (rumpuser_getparam(RUMPUSER_PARAM_NCPU, buf, sizeof(buf)) != 0)
 		panic("mandatory hypervisor configuration (NCPU) missing");
 	numcpu = strtoll(buf, NULL, 10);
 	if (numcpu < 1) {
 		panic("rump kernels are not lightweight enough for \"%d\" CPUs",
 		    numcpu);
+	}
 	rump_thread_init();
 	rump_cpus_bootstrap(&numcpu);
 	rumpuser_clock_gettime(RUMPUSER_CLOCK_RELWALL, &sec, &nsec);
 	boottime.tv_sec = sec;
 	boottime.tv_nsec = nsec;
 	initmsgbuf(rump_msgbuf, sizeof(rump_msgbuf));
 	aprint_verbose("%s%s", copyright, version);
 	rump_intr_init(numcpu);
 	rump_tsleep_init();
 	rumpuser_mutex_init(&rump_giantlock, RUMPUSER_MTX_SPIN);
 	ksyms_init();
 	uvm_init();
 	evcnt_init();
 	kcpuset_sysinit();
 	once_init();
 	kernconfig_lock_init();
 	prop_kern_init();
 	kmem_init();
 	uvm_ra_init();
 	uao_init();
 	mutex_obj_init();
 	rw_obj_init();
 	callout_startup();
 	kprintf_init();
 	percpu_init();
 	pserialize_init();
 	kauth_init();
 	secmodel_init();
 	sysctl_init();
 	/*
 	 * The above call to sysctl_init() only initializes sysctl nodes
 	 * from link sets.  Initialize sysctls in case we used ctors.
 	 */
 #ifdef RUMP_USE_CTOR
+	{
 		struct sysctl_setup_chain *ssc;
 		while ((ssc = LIST_FIRST(&sysctl_boot_chain)) != NULL) {
 			LIST_REMOVE(ssc, ssc_entries);
 			ssc->ssc_func(NULL);
+		}
+	}
 #endif /* RUMP_USE_CTOR */
 	rnd_init();
 	cprng_init();
 	kern_cprng = cprng_strong_create("kernel", IPL_VM,
 	    CPRNG_INIT_ANY|CPRNG_REKEY_ANY);
 	rump_hyperentropy_init();
 	procinit();
 	proc0_init();
 	uid_init();
 	chgproccnt(0, 1);
 	l->l_proc = &proc0;
 	lwp_update_creds(l);
 	lwpinit_specificdata();
 	lwp_initspecific(&lwp0);
 	loginit();
 	rump_biglock_init();
 	rump_scheduler_init(numcpu);
 	/* revert temporary context and schedule a semireal context */
 	rump_lwproc_curlwp_clear(l);
 	initproc = &proc0; /* borrow proc0 before we get initproc started */
 	rump_schedule();
 	bootlwp = curlwp;
 	percpu_init();
 	inittimecounter();
 	ntp_init();
 #ifdef KTRACE
 	ktrinit();
 #endif
 	ts = boottime;
 	tc_setclock(&ts);
 	extern krwlock_t exec_lock;
 	rw_init(&exec_lock);
 	/* we are mostly go.  do per-cpu subsystem init */
 	for (i = 0; i < numcpu; i++) {
 		struct cpu_info *ci = cpu_lookup(i);
 		/* attach non-bootstrap CPUs */
 		if (i > 0) {
 			rump_cpu_attach(ci);
 			ncpu++;
+		}
 		callout_init_cpu(ci);
 		softint_init(ci);
 		xc_init_cpu(ci);
 		pool_cache_cpu_init(ci);
 		selsysinit(ci);
 		percpu_init_cpu(ci);
 		TAILQ_INIT(&ci->ci_data.cpu_ld_locks);
 		__cpu_simple_lock_init(&ci->ci_data.cpu_ld_lock);
 		aprint_verbose("cpu%d at thinair0: rump virtual cpu\n", i);
+	}
 	ncpuonline = ncpu;
 	/* Once all CPUs are detected, initialize the per-CPU cprng_fast.  */
 	cprng_fast_init();
 	/* CPUs are up.  allow kernel threads to run */
 	rump_thread_allow(NULL);
 	rnd_init_softint();
 	kqueue_init();
 	iostat_init();
 	fd_sys_init();
 	module_init();
 	devsw_init();
 	pipe_init();
 	resource_init();
 	procinit_sysctl();
 	time_init();
 	time_init2();
 	/* start page baroness */
 	if (rump_threads) {
 		if (kthread_create(PRI_PGDAEMON, KTHREAD_MPSAFE, NULL,
 		    uvm_pageout, NULL, &uvm.pagedaemon_lwp, "pdaemon") != 0)
 			panic("pagedaemon create failed");
 	} else
 		uvm.pagedaemon_lwp = NULL; /* doesn't match curlwp */
 	/* process dso's */
 	rumpuser_dl_bootstrap(add_linkedin_modules,
 	    rump_kernelfsym_load, rump_component_load);
 	rump_component_addlocal();
 	rump_component_init(RUMP_COMPONENT_KERN);
 	/* initialize factions, if present */
 	rump_component_init(RUMP__FACTION_VFS);
 	/* pnbuf_cache is used even without vfs */
 	if (rump_component_count(RUMP__FACTION_VFS) == 0) {
 		pnbuf_cache = pool_cache_init(MAXPATHLEN, 0, 0, 0, "pnbufpl",
 		    NULL, IPL_NONE, NULL, NULL, NULL);
+	}
 	rump_component_init(RUMP__FACTION_NET);
 	rump_component_init(RUMP__FACTION_DEV);
 	KASSERT(rump_component_count(RUMP__FACTION_VFS) <= 1
 	    && rump_component_count(RUMP__FACTION_NET) <= 1
 	    && rump_component_count(RUMP__FACTION_DEV) <= 1);
 	rump_component_init(RUMP_COMPONENT_KERN_VFS);
 	/*
 	 * if we initialized the tty component above, the tyttymtx is
 	 * now initialized.  otherwise, we need to initialize it.
 	 */
 	if (!rump_ttycomponent)
 		mutex_init(&tty_lock, MUTEX_DEFAULT, IPL_VM);
 	cold = 0;
 	/* aieeeedondest */
 	if (rump_threads) {
 		if (workqueue_create(&uvm.aiodone_queue, "aiodoned",
 		    rump_aiodone_worker, NULL, 0, 0, WQ_MPSAFE))
 			panic("aiodoned");
+	}
 	sysctl_finalize();
 	module_init_class(MODULE_CLASS_ANY);
 	if (rumpuser_getparam(RUMPUSER_PARAM_HOSTNAME,
 	    hostname, MAXHOSTNAMELEN) != 0) {
 		panic("mandatory hypervisor configuration (HOSTNAME) missing");
+	}
 	hostnamelen = strlen(hostname);
 	sigemptyset(&sigcantmask);
 	if (rump_threads)
 		vmem_rehash_start();
 	/*
 	 * Create init (proc 1), used to attach implicit threads in rump.
 	 * (note: must be done after vfsinit to get cwdi)
 	 */
 	initlwp = rump__lwproc_alloclwp(NULL);
 	mutex_enter(proc_lock);
 	initproc = proc_find_raw(1);
 	mutex_exit(proc_lock);
 	if (initproc == NULL)
 		panic("where in the world is initproc?");
 	strlcpy(initproc->p_comm, "rumplocal", sizeof(initproc->p_comm));
 	rump_component_init(RUMP_COMPONENT_POSTINIT);
 	/* load syscalls */
 	rump_component_init(RUMP_COMPONENT_SYSCALL);
 	/* component inits done */
 	bootlwp = NULL;
 	/* open 0/1/2 for init */
 	KASSERT(rump_lwproc_curlwp() == NULL);
 	rump_lwproc_switch(initlwp);
 	rump_consdev_init();
 	rump_lwproc_switch(NULL);
 	/* release cpu */
 	rump_unschedule();
 	return 0;
+}
 /* historic compat */
 __strong_alias(rump__init,rump_init);
 static int compcounter[RUMP_COMPONENT_MAX];
 static int compinited[RUMP_COMPONENT_MAX];
 /*
  * Yea, this is O(n^2), but we're only looking at a handful of components.
  * Components are always initialized from the thread that called rump_init().
  */
 static LIST_HEAD(, rump_component) rchead = LIST_HEAD_INITIALIZER(rchead);
 #ifdef RUMP_USE_CTOR
 struct modinfo_boot_chain modinfo_boot_chain \
     = LIST_HEAD_INITIALIZER(modinfo_boot_chain);
 static void
 rump_component_addlocal(void)
+{
 	struct modinfo_chain *mc;
 	while ((mc = LIST_FIRST(&modinfo_boot_chain)) != NULL) {
 		LIST_REMOVE(mc, mc_entries);
 		module_builtin_add(&mc->mc_info, 1, false);
+	}
+}
 #else /* RUMP_USE_CTOR */
 static void
 rump_component_addlocal(void)
+{
 	__link_set_decl(rump_components, struct rump_component);
 	struct rump_component *const *rc;
 	__link_set_foreach(rc, rump_components) {
 		rump_component_load(*rc);
+	}
+}
 #endif /* RUMP_USE_CTOR */
 void
 rump_component_load(const struct rump_component *rc_const)
+{
 	struct rump_component *rc, *rc_iter;
 	/* time for rump component loading and unloading has passed */
 	if (!cold)
 		return;
 	/*
 	 * XXX: this is ok since the "const" was removed from the
 	 * definition of RUMP_COMPONENT().
+	 *
 	 * However, to preserve the hypercall interface, the const
 	 * remains here.  This can be fixed in the next hypercall revision.
 	 */
 	rc = __UNCONST(rc_const);
 	KASSERT(!rump_inited || curlwp == bootlwp);
 	LIST_FOREACH(rc_iter, &rchead, rc_entries) {
 		if (rc_iter == rc)
 			return;
+	}
 	LIST_INSERT_HEAD(&rchead, rc, rc_entries);
 	KASSERT(rc->rc_type < RUMP_COMPONENT_MAX);
 	compcounter[rc->rc_type]++;
+}
 void
 rump_component_unload(struct rump_component *rc)
+{
 	/*
 	 * Checking for cold is enough because rump_init() both
 	 * flips it and handles component loading.
 	 */
 	if (!cold)
 		return;
 	LIST_REMOVE(rc, rc_entries);
+}
 int
 rump_component_count(enum rump_component_type type)
+{
 	KASSERT(curlwp == bootlwp);
 	KASSERT(type < RUMP_COMPONENT_MAX);
 	return compcounter[type];
+}
 void
 rump_component_init(enum rump_component_type type)
+{
 	const struct rump_component *rc, *rc_safe;
 	KASSERT(curlwp == bootlwp);
 	KASSERT(!compinited[type]);
 	LIST_FOREACH_SAFE(rc, &rchead, rc_entries, rc_safe) {
 		if (rc->rc_type == type) {
 			rc->rc_init();
 			LIST_REMOVE(rc, rc_entries);
+		}
+	}
 	compinited[type] = 1;
+}
 /*
  * Initialize a module which has already been loaded and linked
  * with dlopen(). This is fundamentally the same as a builtin module.
+ *
  * XXX: this interface does not really work in the RUMP_USE_CTOR case,
  * but I'm not sure it's anything to cry about.  In feeling blue,
  * things could somehow be handled via modinfo_boot_chain.
  */
 int
 rump_module_init(const struct modinfo * const *mip, size_t nmodinfo)
+{
 	return module_builtin_add(mip, nmodinfo, true);
+}
 /*
  * Finish module (flawless victory, fatality!).
  */
 int
 rump_module_fini(const struct modinfo *mi)
+{
 	return module_builtin_remove(mi, true);
+}
 /*
  * Add loaded and linked module to the builtin list.  It will
  * later be initialized with module_init_class().
  */
 static void
 add_linkedin_modules(const struct modinfo * const *mip, size_t nmodinfo)
+{
 	module_builtin_add(mip, nmodinfo, false);
+}
 int
 rump_kernelfsym_load(void *symtab, uint64_t symsize,
 	char *strtab, uint64_t strsize)
+{
 	static int inited = 0;
 	Elf64_Ehdr ehdr;
 	if (inited)
 		return EBUSY;
 	inited = 1;
 	/*
 	 * Use 64bit header since it's bigger.  Shouldn't make a
 	 * difference, since we're passing in all zeroes anyway.
 	 */
 	memset(&ehdr, 0, sizeof(ehdr));
 	ksyms_addsyms_explicit(&ehdr, symtab, symsize, strtab, strsize);
 	return 0;
+}
 int
 rump_boot_gethowto()
+{
 	return boothowto;
+}
 void
 rump_boot_sethowto(int howto)
+{
 	boothowto = howto;
+}
 int
 rump_getversion(void)
+{
 	return __NetBSD_Version__;
+}
 /* compat */
 __strong_alias(rump_pub_getversion,rump_getversion);
 /*
  * Note: may be called unscheduled.  Not fully safe since no locking
  * of allevents (currently that's not even available).
  */
 void
 rump_printevcnts()
+{
 	struct evcnt *ev;
 	TAILQ_FOREACH(ev, &allevents, ev_list)
 		rumpuser_dprintf("%s / %s: %" PRIu64 "\n",
 		    ev->ev_group, ev->ev_name, ev->ev_count);
+}
 /*
  * If you use this interface ... well ... all bets are off.
  * The original purpose is for the p2k fs server library to be
  * able to use the same pid/lid for VOPs as the host kernel.
  */
 void
 rump_allbetsareoff_setid(pid_t pid, int lid)
+{
 	struct lwp *l = curlwp;
 	struct proc *p = l->l_proc;
 	l->l_lid = lid;
 	p->p_pid = pid;
+}
 #include <sys/pserialize.h>
 static void
 ipiemu(void *a1, void *a2)
+{
 	xc__highpri_intr(NULL);
 	pserialize_switchpoint();
+}
 void
 rump_xc_highpri(struct cpu_info *ci)
+{
 	if (ci)
 		xc_unicast(0, ipiemu, NULL, NULL, ci);
 	else
 		xc_broadcast(0, ipiemu, NULL, NULL);
+}
 int
 rump_syscall(int num, void *data, size_t dlen, register_t *retval)
+{
 	struct proc *p;
 	struct emul *e;
 	struct sysent *callp;
 	const int *etrans = NULL;
 	int rv;
 	rump_schedule();
 	p = curproc;
 	e = p->p_emul;
 #ifndef __HAVE_MINIMAL_EMUL
 	KASSERT(num > 0 && num < e->e_nsysent);
 #endif
 	callp = e->e_sysent + num;
 	rv = sy_invoke(callp, curlwp, data, retval, num);
 	/*
 	 * I hope that (!__HAVE_MINIMAL_EMUL || __HAVE_SYSCALL_INTERN) is
 	 * an invariant ...
 	 */
 #if !defined(__HAVE_MINIMAL_EMUL)
 	etrans = e->e_errno;
 #elif defined(__HAVE_SYSCALL_INTERN)
 	etrans = p->p_emuldata;
 #endif
 	if (etrans) {
 		rv = etrans[rv];
 		/*
 		 * XXX: small hack since Linux etrans vectors on some
 		 * archs contain negative errnos, but rump_syscalls
 		 * uses the -1 + errno ABI.  Note that these
 		 * negative values are always the result of translation,
 		 * otherwise the above translation method would not
 		 * work very well.
 		 */
 		if (rv < 0)
 			rv = -rv;
+	}
 	rump_unschedule();
 	return rv;
+}
 void
 rump_syscall_boot_establish(const struct rump_onesyscall *calls, size_t ncall)
+{
 	struct sysent *callp;
 	size_t i;
 	for (i = 0; i < ncall; i++) {
 		callp = rump_sysent + calls[i].ros_num;
 		KASSERT(bootlwp != NULL
 		    && callp->sy_call == (sy_call_t *)enosys);
 		callp->sy_call = calls[i].ros_handler;
+	}
+}
 struct rump_boot_etfs *ebstart;
 void
 rump_boot_etfs_register(struct rump_boot_etfs *eb)
+{
 	/*
 	 * Could use atomics, but, since caller would need to synchronize
 	 * against calling rump_init() anyway, easier to just specify the
 	 * interface as "caller serializes".  This solve-by-specification
 	 * approach avoids the grey area of using atomics before rump_init()
 	 * runs.
 	 */
 	eb->_eb_next = ebstart;
 	eb->eb_status = -1;
 	ebstart = eb;
+}