From 500ca73d43caa7b71b10d84c7961fe8505cf5da4 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Tue, 20 Feb 2018 20:39:34 +0000 Subject: [PATCH] mtx: add debug assertions to mtx_spin_wait_unlocked --- sys/kern/kern_mutex.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index cd9493bd3119..13502b42122d 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -1231,6 +1231,14 @@ mtx_spin_wait_unlocked(struct mtx *m) { struct lock_delay_arg lda; + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("%s() of destroyed mutex %p", __func__, m)); + KASSERT(LOCK_CLASS(&m->lock_object) == &lock_class_mtx_spin, + ("%s() of sleep mutex %p (%s)", __func__, m, + m->lock_object.lo_name)); + KASSERT(!mtx_owned(m), ("%s() waiting on myself on lock %p (%s)", __func__, m, + m->lock_object.lo_name)); + lda.spin_cnt = 0; while (atomic_load_acq_ptr(&m->mtx_lock) != MTX_UNOWNED) {