Commit 91af7081 authored May 12, 2010 by Michel Lespinasse Committed by Linus Torvalds May 12, 2010

rwsem: Test for no active locks in __rwsem_do_wake undo code



If there are no active threasd using a semaphore, it is always correct
to unqueue blocked threads.  This seems to be what was intended in the
undo code.

What was done instead, was to look for a sem count of zero - this is an
impossible situation, given that at least one thread is known to be
queued on the semaphore.  The code might be correct as written, but it's
hard to reason about and it's not what was intended (otherwise the goto
out would have been unconditional).

Go for checking the active count - the alternative is not worth the
headache.

Signed-off-by: Michel Lespinasse <walken@google.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent cea0d767

lib/rwsem.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -136,9 +136,10 @@ __rwsem_do_wake(struct rw_semaphore *sem, int downgrading)
		out:
		return sem;

		/* undo the change to count, but check for a transition 1->0 */
		/* undo the change to the active count, but check for a transition
		* 1->0 */
		undo:
		if (rwsem_atomic_update(-RWSEM_ACTIVE_BIAS, sem) != 0)
		if (rwsem_atomic_update(-RWSEM_ACTIVE_BIAS, sem) & RWSEM_ACTIVE_MASK)
		goto out;
		goto try_again;
		}

Admin message