 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_lock.c,v 1.167 2020/01/24 20:05:15 ad Exp $	*/
+/*	$NetBSD: kern_lock.c,v 1.168 2020/01/27 21:05:43 ad Exp $	*/
 /*-
  * Copyright (c) 2002, 2006, 2007, 2008, 2009, 2020 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,40 +21,48 @@
  * ``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.167 2020/01/24 20:05:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.168 2020/01/27 21:05:43 ad Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_lockdebug.h"
 #endif
 #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>
 #if defined(DIAGNOSTIC) && !defined(LOCKDEBUG)
 #include <sys/ksyms.h>
 #endif
 #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)
 @@ -205,26 +213,29 @@ _kernel_lock(int nlocks)
 	 * 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.
+	 *
 	 * However, we won't set ci_biglock_wanted until we've spun for
 	 * a bit, as we don't want to make any lock waiters in rw_oncpu()
 	 * or mutex_oncpu() block prematurely.
 	 */
 	membar_producer();
 	owant = ci->ci_biglock_wanted;
 	ci->ci_biglock_wanted = l;
 #if defined(DIAGNOSTIC) && !defined(LOCKDEBUG)
 	l->l_ld_wanted = __builtin_return_address(0);
 #endif
 	/*
 	 * Spin until we acquire the lock.  Once we have it, record the
 	 * time spent with lockstat.
 	 */
 	LOCKSTAT_ENTER(lsflag);
 	LOCKSTAT_START_TIMER(lsflag, spintime);
 	do {
 		splx(s);
 		while (__SIMPLELOCK_LOCKED_P(kernel_lock)) {
 #ifdef LOCKDEBUG
 			if (SPINLOCK_SPINOUT(spins)) {
 @@ -320,13 +331,33 @@ _kernel_unlock(int nlocks, int *countp)
 		l->l_blcnt -= nlocks;
 		splx(s);
+	}
 	if (countp != NULL)
 		*countp = olocks;
+}
 bool
 _kernel_locked_p(void)
+{
 	return __SIMPLELOCK_LOCKED_P(kernel_lock);
+}
 void
 kernel_lock_plug_leak(void)
+{
 #ifndef LOCKDEBUG
 # ifdef DIAGNOSTIC
 	int biglocks = 0;
 	KERNEL_UNLOCK_ALL(curlwp, &biglocks);
 	if (biglocks != 0) {
 		const char *sym = "(unknown)";
 		ksyms_getname(NULL, &sym, (vaddr_t)curlwp->l_ld_wanted,
 		    KSYMS_CLOSEST|KSYMS_PROC|KSYMS_ANY);
 		printf("kernel_lock leak detected. last acquired: %s / %p\n",
 		    sym, curlwp->l_ld_wanted);
+	}
 # else
 	KERNEL_UNLOCK_ALL(curlwp, NULL);
 # endif
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: lock.h,v 1.87 2018/07/10 19:55:05 maya Exp $	*/
+/*	$NetBSD: lock.h,v 1.88 2020/01/27 21:05:43 ad Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2006, 2007 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, by Ross Harvey, 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
 @@ -99,16 +99,18 @@ do {								\
 	}							\
 	if ((count) < SPINLOCK_BACKOFF_MAX)			\
 		(count) += (count);				\
 } while (/* CONSTCOND */ 0);
 #ifdef LOCKDEBUG
 #define	SPINLOCK_SPINOUT(spins)		((spins)++ > 0x0fffffff)
 #else
 #define	SPINLOCK_SPINOUT(spins)		((void)(spins), 0)
 #endif
 extern __cpu_simple_lock_t kernel_lock[];
 void	kernel_lock_plug_leak(void);
 #endif /* _KERNEL */
 #endif /* _SYS_LOCK_H_ */