Commit 24f3f6b5 authored by Chris Metcalf's avatar Chris Metcalf
Browse files

arch/tile: fix rwlock so would-be write lockers don't block new readers 



This avoids a deadlock in the IGMP code where one core gets a read
lock, another core starts trying to get a write lock (thus blocking
new readers), and then the first core tries to recursively re-acquire
the read lock.

We still try to preserve some degree of balance by giving priority
to additional write lockers that come along while the lock is held
for write, so they can all complete quickly and return the lock to
the readers.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent d02db4f8

arch/tile/lib/spinlock_32.c

+18 −11
Original line number Original line Diff line number Diff line
@@ -167,23 +167,30 @@ void arch_write_lock_slow(arch_rwlock_t *rwlock, u32 val) 
	 * when we compare them.

	 * when we compare them.

	 */

	 */

	u32 my_ticket_;

	u32 my_ticket_;

	u32 iterations = 0;





	/* Take out the next ticket; this will also stop would-be readers. */

	/*

	if (val & 1)

	 * Wait until there are no readers, then bump up the next

		val = get_rwlock(rwlock);

	 * field and capture the ticket value.

	rwlock->lock = __insn_addb(val, 1 << WR_NEXT_SHIFT);

	 */

	for (;;) {

		if (!(val & 1)) {

			if ((val >> RD_COUNT_SHIFT) == 0)

				break;

			rwlock->lock = val;

		}

		delay_backoff(iterations++);

		val = __insn_tns((int *)&rwlock->lock);

	}





	/* Extract my ticket value from the original word. */

	/* Take out the next ticket and extract my ticket value. */

	rwlock->lock = __insn_addb(val, 1 << WR_NEXT_SHIFT);

	my_ticket_ = val >> WR_NEXT_SHIFT;

	my_ticket_ = val >> WR_NEXT_SHIFT;





	/*

	/* Wait until the "current" field matches our ticket. */

	 * Wait until the "current" field matches our ticket, and

	 * there are no remaining readers.

	 */

	for (;;) {

	for (;;) {

		u32 curr_ = val >> WR_CURR_SHIFT;

		u32 curr_ = val >> WR_CURR_SHIFT;

		u32 readers = val >> RD_COUNT_SHIFT;

		u32 delta = ((my_ticket_ - curr_) & WR_MASK);

		u32 delta = ((my_ticket_ - curr_) & WR_MASK) + !!readers;

		if (likely(delta == 0))

		if (likely(delta == 0))

			break;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE