 @@ -1,14 +1,14 @@
-/*	$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
 @@ -21,38 +21,39 @@
  * ``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
 @@ -78,26 +79,29 @@ assert_sleepable(void)
 	} 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)						\

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -28,27 +28,27 @@
 /*
  * 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>
 @@ -63,42 +63,51 @@ static u_int			psz_work_todo	__cacheline
 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);
 @@ -175,50 +184,75 @@ pserialize_perform(pserialize_t psz)
 		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());
 @@ -251,13 +285,71 @@ pserialize_switchpoint(void)
 		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,14 +1,14 @@
-/*	$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.
+ *
 @@ -16,36 +16,37 @@
  * 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;
 /*
 @@ -155,31 +156,43 @@ kpause(const char *wmesg, bool intr, int
 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.
 	 */
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
 @@ -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: 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>
 @@ -291,26 +291,27 @@ rump_init(void)
 	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;
 @@ -341,27 +342,26 @@ rump_init(void)
 	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);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pserialize.h,v 1.1 2011/07/30 17:01:04 christos Exp $	*/
+/*	$NetBSD: pserialize.h,v 1.1.46.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.
 @@ -34,16 +34,18 @@
 struct pserialize;
 typedef struct pserialize *pserialize_t;
 void		pserialize_init(void);
 void		pserialize_switchpoint(void);
 pserialize_t	pserialize_create(void);
 void		pserialize_destroy(pserialize_t);
 void		pserialize_perform(pserialize_t);
 int		pserialize_read_enter(void);
 void		pserialize_read_exit(int);
 bool		pserialize_in_read_section(void);
 bool		pserialize_not_in_read_section(void);
 #endif	/* _KERNEL */
 #endif	/* _SYS_PSERIALIZE_H_ */