summaryrefslogtreecommitdiff
path: root/sys/kern/kern_timeout.c
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2022-03-30 14:54:29 +0000
committerriastradh <riastradh@NetBSD.org>2022-03-30 14:54:29 +0000
commita2bbd8e6082489b6e4b5fcd4fa94a843c7547576 (patch)
tree6de13372ac3111fd39d999cacb288ba53c54107f /sys/kern/kern_timeout.c
parent30cc99de2d1ee2b6eca5ea53d4faa12c549b7e26 (diff)
Revert "kern: Sprinkle biglock-slippage assertions."
Got the diagnostic information I needed from this, and it's holding up releng tests of everything else, so let's back this out until I need more diagnostics or track down the original source of the problem.
Diffstat (limited to 'sys/kern/kern_timeout.c')
-rw-r--r--sys/kern/kern_timeout.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 35b235819f0..6af1753237f 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_timeout.c,v 1.67 2022/03/30 10:34:14 riastradh Exp $ */
+/* $NetBSD: kern_timeout.c,v 1.68 2022/03/30 14:54:29 riastradh Exp $ */
/*-
* Copyright (c) 2003, 2006, 2007, 2008, 2009, 2019 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.67 2022/03/30 10:34:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.68 2022/03/30 14:54:29 riastradh Exp $");
/*
* Timeouts are kept in a hierarchical timing wheel. The c_time is the
@@ -740,7 +740,7 @@ callout_softclock(void *v)
struct callout_cpu *cc;
void (*func)(void *);
void *arg;
- int mpsafe, count, ticks, delta, locks;
+ int mpsafe, count, ticks, delta;
lwp_t *l;
l = curlwp;
@@ -776,7 +776,6 @@ callout_softclock(void *v)
cc->cc_active = c;
mutex_spin_exit(cc->cc_lock);
- locks = curcpu()->ci_biglock_count;
KASSERT(func != NULL);
if (__predict_false(!mpsafe)) {
KERNEL_LOCK(1, NULL);
@@ -784,9 +783,6 @@ callout_softclock(void *v)
KERNEL_UNLOCK_ONE(NULL);
} else
(*func)(arg);
- KASSERTMSG(locks == curcpu()->ci_biglock_count,
- "callout %p func %p slipped %d->%d biglocks",
- c, func, locks, curcpu()->ci_biglock_count);
mutex_spin_enter(cc->cc_lock);
/*