diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2005-12-29 20:54:25 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2005-12-29 20:54:25 +0000 |
| commit | b0e9883e2faf5e99b43859e34d257b8c8ad00d4b (patch) | |
| tree | 68b60e603ba636fd07faefa1ceb6c82c5405f48d /sys/kern | |
| parent | 0a46ed7d569666a1e4a8fa844a87439e5dba9a6d (diff) | |
| download | src-b0e9883e2faf5e99b43859e34d257b8c8ad00d4b.tar.gz src-b0e9883e2faf5e99b43859e34d257b8c8ad00d4b.zip | |
Notes
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_witness.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 12e64f157c62..55e45e572288 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -1807,15 +1807,20 @@ witness_display_spinlock(struct lock_object *lock, struct thread *owner) void witness_save(struct lock_object *lock, const char **filep, int *linep) { + struct lock_list_entry *lock_list; struct lock_instance *instance; KASSERT(!witness_cold, ("%s: witness_cold", __func__)); if (lock->lo_witness == NULL || witness_watch == 0 || panicstr != NULL) return; - if ((lock->lo_class->lc_flags & LC_SLEEPLOCK) == 0) - panic("%s: lock (%s) %s is not a sleep lock", __func__, - lock->lo_class->lc_name, lock->lo_name); - instance = find_instance(curthread->td_sleeplocks, lock); + if (lock->lo_class->lc_flags & LC_SLEEPLOCK) + lock_list = curthread->td_sleeplocks; + else { + if (witness_skipspin) + return; + lock_list = PCPU_GET(spinlocks); + } + instance = find_instance(lock_list, lock); if (instance == NULL) panic("%s: lock (%s) %s not locked", __func__, lock->lo_class->lc_name, lock->lo_name); @@ -1826,15 +1831,20 @@ witness_save(struct lock_object *lock, const char **filep, int *linep) void witness_restore(struct lock_object *lock, const char *file, int line) { + struct lock_list_entry *lock_list; struct lock_instance *instance; KASSERT(!witness_cold, ("%s: witness_cold", __func__)); if (lock->lo_witness == NULL || witness_watch == 0 || panicstr != NULL) return; - if ((lock->lo_class->lc_flags & LC_SLEEPLOCK) == 0) - panic("%s: lock (%s) %s is not a sleep lock", __func__, - lock->lo_class->lc_name, lock->lo_name); - instance = find_instance(curthread->td_sleeplocks, lock); + if (lock->lo_class->lc_flags & LC_SLEEPLOCK) + lock_list = curthread->td_sleeplocks; + else { + if (witness_skipspin) + return; + lock_list = PCPU_GET(spinlocks); + } + instance = find_instance(lock_list, lock); if (instance == NULL) panic("%s: lock (%s) %s not locked", __func__, lock->lo_class->lc_name, lock->lo_name); |