Author: mjg
Date: Mon Feb 6 09:40:14 2017
New Revision: 313335
URL: https://svnweb.freebsd.org/changeset/base/313335
Log:
locks: fix recursion support after recent changes
When a relevant lockstat probe is enabled the fallback primitive is called
with
a constant signifying a free lock. This works fine for typical cases but
breaks
with recursion, since it checks if the passed value is that of the executing
thread.
Read the value if necessary.
Modified:
head/sys/kern/kern_mutex.c
head/sys/kern/kern_rwlock.c
head/sys/kern/kern_sx.c
Modified: head/sys/kern/kern_mutex.c
==============================================================================
--- head/sys/kern/kern_mutex.c Mon Feb 6 09:31:25 2017 (r313334)
+++ head/sys/kern/kern_mutex.c Mon Feb 6 09:40:14 2017 (r313335)
@@ -495,6 +495,8 @@ __mtx_lock_sleep(volatile uintptr_t *c,
lock_delay_arg_init(&lda, NULL);
#endif
m = mtxlock2mtx(c);
+ if (__predict_false(v == MTX_UNOWNED))
+ v = MTX_READ_VALUE(m);
if (__predict_false(lv_mtx_owner(v) == (struct thread *)tid)) {
KASSERT((m->lock_object.lo_flags & LO_RECURSABLE) != 0 ||
Modified: head/sys/kern/kern_rwlock.c
==============================================================================
--- head/sys/kern/kern_rwlock.c Mon Feb 6 09:31:25 2017 (r313334)
+++ head/sys/kern/kern_rwlock.c Mon Feb 6 09:40:14 2017 (r313335)
@@ -812,6 +812,8 @@ __rw_wlock_hard(volatile uintptr_t *c, u
lock_delay_arg_init(&lda, NULL);
#endif
rw = rwlock2rw(c);
+ if (__predict_false(v == RW_UNLOCKED))
+ v = RW_READ_VALUE(rw);
if (__predict_false(lv_rw_wowner(v) == (struct thread *)tid)) {
KASSERT(rw->lock_object.lo_flags & LO_RECURSABLE,
Modified: head/sys/kern/kern_sx.c
==============================================================================
--- head/sys/kern/kern_sx.c Mon Feb 6 09:31:25 2017 (r313334)
+++ head/sys/kern/kern_sx.c Mon Feb 6 09:40:14 2017 (r313335)
@@ -531,6 +531,9 @@ _sx_xlock_hard(struct sx *sx, uintptr_t
lock_delay_arg_init(&lda, NULL);
#endif
+ if (__predict_false(x == SX_LOCK_UNLOCKED))
+ x = SX_READ_VALUE(sx);
+
/* If we already hold an exclusive lock, then recurse. */
if (__predict_false(lv_sx_owner(x) == (struct thread *)tid)) {
KASSERT((sx->lock_object.lo_flags & LO_RECURSABLE) != 0,
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
