diff options
| author | attilio <attilio@FreeBSD.org> | 2012-12-22 09:37:34 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2012-12-22 09:37:34 +0000 |
| commit | d2861e92958113d0e11a6d2708af91daa4ed0125 (patch) | |
| tree | 223c35655c8b163024a006c82d65f305e5d2126d /sys/kern/kern_lock.c | |
| parent | 32527711e11108602452789b89ff5efdbdc3fef2 (diff) | |
| download | FreeBSD-src-d2861e92958113d0e11a6d2708af91daa4ed0125.zip FreeBSD-src-d2861e92958113d0e11a6d2708af91daa4ed0125.tar.gz | |
Fixup r240424: On entering KDB backends, the hijacked thread to run
interrupt context can still be idlethread. At that point, without the
panic condition, it can still happen that idlethread then will try to
acquire some locks to carry on some operations.
Skip the idlethread check on block/sleep lock operations when KDB is
active.
Reported by: jh
Tested by: jh
MFC after: 1 week
Diffstat (limited to 'sys/kern/kern_lock.c')
| -rw-r--r-- | sys/kern/kern_lock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index cc276db..98f0156 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/kdb.h> #include <sys/ktr.h> #include <sys/lock.h> #include <sys/lock_profile.h> @@ -477,7 +478,7 @@ __lockmgr_args(struct lock *lk, u_int flags, struct lock_object *ilk, KASSERT((flags & LK_INTERLOCK) == 0 || ilk != NULL, ("%s: LK_INTERLOCK passed without valid interlock @ %s:%d", __func__, file, line)); - KASSERT(!TD_IS_IDLETHREAD(curthread), + KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread), ("%s: idle thread %p on lockmgr %s @ %s:%d", __func__, curthread, lk->lock_object.lo_name, file, line)); |
