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_mutex.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_mutex.c')
| -rw-r--r-- | sys/kern/kern_mutex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 2f13863..39f461e 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -210,7 +210,7 @@ __mtx_lock_flags(volatile uintptr_t *c, int opts, const char *file, int line) m = mtxlock2mtx(c); - KASSERT(!TD_IS_IDLETHREAD(curthread), + KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread), ("mtx_lock() by idle thread %p on sleep mutex %s @ %s:%d", curthread, m->lock_object.lo_name, file, line)); KASSERT(m->mtx_lock != MTX_DESTROYED, @@ -326,7 +326,7 @@ _mtx_trylock_flags_(volatile uintptr_t *c, int opts, const char *file, int line) m = mtxlock2mtx(c); - KASSERT(!TD_IS_IDLETHREAD(curthread), + KASSERT(kdb_active != 0 || !TD_IS_IDLETHREAD(curthread), ("mtx_trylock() by idle thread %p on sleep mutex %s @ %s:%d", curthread, m->lock_object.lo_name, file, line)); KASSERT(m->mtx_lock != MTX_DESTROYED, |
