diff options
author | 2018-03-21 12:28:39 +0000 | |
---|---|---|
committer | 2018-03-21 12:28:39 +0000 | |
commit | bfac824735012edfa55755cd502c874f739b3fb9 (patch) | |
tree | 9d48f0b73a36cc4ed0d2b592a40557b632f1a896 /sys/kern/kern_rwlock.c | |
parent | Add mvicu(4), a driver for the Interrupt Consolidation Unit found on (diff) | |
download | wireguard-openbsd-bfac824735012edfa55755cd502c874f739b3fb9.tar.xz wireguard-openbsd-bfac824735012edfa55755cd502c874f739b3fb9.zip |
Disable the rw lock assertion after panic. Allows reboot from ddb.
OK mpi@ visa@
Diffstat (limited to 'sys/kern/kern_rwlock.c')
-rw-r--r-- | sys/kern/kern_rwlock.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index 1bde7064757..d24bb6c8734 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_rwlock.c,v 1.34 2018/03/20 15:45:32 mpi Exp $ */ +/* $OpenBSD: kern_rwlock.c,v 1.35 2018/03/21 12:28:39 bluhm Exp $ */ /* * Copyright (c) 2002, 2003 Artur Grabowski <art@openbsd.org> @@ -333,6 +333,9 @@ rw_status(struct rwlock *rwl) void rw_assert_wrlock(struct rwlock *rwl) { + if (panicstr || db_active) + return; + if (!(rwl->rwl_owner & RWLOCK_WRLOCK)) panic("%s: lock not held", rwl->rwl_name); @@ -343,6 +346,9 @@ rw_assert_wrlock(struct rwlock *rwl) void rw_assert_rdlock(struct rwlock *rwl) { + if (panicstr || db_active) + return; + if (!RWLOCK_OWNER(rwl) || (rwl->rwl_owner & RWLOCK_WRLOCK)) panic("%s: lock not shared", rwl->rwl_name); } @@ -350,6 +356,9 @@ rw_assert_rdlock(struct rwlock *rwl) void rw_assert_anylock(struct rwlock *rwl) { + if (panicstr || db_active) + return; + switch (rw_status(rwl)) { case RW_WRITE_OTHER: panic("%s: lock held by different process", rwl->rwl_name); @@ -361,6 +370,9 @@ rw_assert_anylock(struct rwlock *rwl) void rw_assert_unlocked(struct rwlock *rwl) { + if (panicstr || db_active) + return; + if (rwl->rwl_owner != 0L) panic("%s: lock held", rwl->rwl_name); } |