Spurious witness warning when destroying spin mtx

From: Ryan Stone <rysto32_at_gmail.com>
Date: Fri, 23 Nov 2012 22:08:28 -0500
Today I saw a spurious witness warning for "acquiring duplicate lock of
same type".  The root cause is that when running mtx_destroy on a spinlock
that is held by the current thread, mtx_destroy calls spinlock_exit()
before calling WITNESS_UNLOCK, which opens up a window in which the CPU can
be interrupted and attempt to acquire another spinlock of the same type as
the one being destroyed.  This patch should fix it:

diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index 2f13863..96f43f8 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
_at__at_ -918,16 +918,16 _at__at_ _mtx_destroy(volatile uintptr_t *c)
        else {
                MPASS((m->mtx_lock & (MTX_RECURSED|MTX_CONTESTED)) == 0);

+               lock_profile_release_lock(&m->lock_object);
+               /* Tell witness this isn't locked to make it happy. */
+               WITNESS_UNLOCK(&m->lock_object, LOP_EXCLUSIVE, __FILE__,
+                   __LINE__);
+
                /* Perform the non-mtx related part of mtx_unlock_spin(). */
                if (LOCK_CLASS(&m->lock_object) == &lock_class_mtx_spin)
                        spinlock_exit();
                else
                        curthread->td_locks--;
-
-               lock_profile_release_lock(&m->lock_object);
-               /* Tell witness this isn't locked to make it happy. */
-               WITNESS_UNLOCK(&m->lock_object, LOP_EXCLUSIVE, __FILE__,
-                   __LINE__);
        }

        m->mtx_lock = MTX_DESTROYED
Received on Sat Nov 24 2012 - 02:08:29 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:32 UTC