Module Name: src
Committed By: riastradh
Date: Tue Sep 13 09:14:26 UTC 2022
Modified Files:
src/sys/kern: kern_lock.c
Log Message:
KERNEL_LOCK(9): Restore backoff while spinning in !LOCKDEBUG case.
When the spinout logic was put under LOCKDEBUG among a series of
other changes that got reverted, the backoff was inadvertently made
LOCKDEBUG-only too.
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/kern/kern_lock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_lock.c
diff -u src/sys/kern/kern_lock.c:1.178 src/sys/kern/kern_lock.c:1.179
--- src/sys/kern/kern_lock.c:1.178 Sat Aug 20 23:37:12 2022
+++ src/sys/kern/kern_lock.c Tue Sep 13 09:14:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lock.c,v 1.178 2022/08/20 23:37:12 riastradh Exp $ */
+/* $NetBSD: kern_lock.c,v 1.179 2022/09/13 09:14:26 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008, 2009, 2020 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.178 2022/08/20 23:37:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lock.c,v 1.179 2022/09/13 09:14:26 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_lockdebug.h"
@@ -264,9 +264,9 @@ _kernel_lock(int nlocks)
kpreempt_enable();
_KERNEL_LOCK_ABORT("spinout");
}
+#endif
SPINLOCK_BACKOFF_HOOK;
SPINLOCK_SPIN_HOOK;
-#endif
}
s = splvm();
} while (!__cpu_simple_lock_try(kernel_lock));
