forked from Minki/linux
ffffeaf318
Currently, a reader will check first to make sure that the writer mode byte is cleared before incrementing the reader count. That waiting is not really necessary. It increases the latency in the reader/writer to reader transition and reduces readers performance. This patch eliminates that waiting. It also has the side effect of reducing the chance of writer lock stealing and improving the fairness of the lock. Using a locking microbenchmark, a 10-threads 5M locking loop of mostly readers (RW ratio = 10,000:1) has the following performance numbers in a Haswell-EX box: Kernel Locking Rate (Kops/s) ------ --------------------- 4.1.1 15,063,081 4.1.1+patch 17,241,552 (+14.4%) Signed-off-by: Waiman Long <Waiman.Long@hp.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Douglas Hatch <doug.hatch@hp.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Scott J Norton <scott.norton@hp.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will.deacon@arm.com> Link: http://lkml.kernel.org/r/1436459543-29126-2-git-send-email-Waiman.Long@hp.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
150 lines
4.0 KiB
C
150 lines
4.0 KiB
C
/*
|
|
* Queued read/write locks
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* (C) Copyright 2013-2014 Hewlett-Packard Development Company, L.P.
|
|
*
|
|
* Authors: Waiman Long <waiman.long@hp.com>
|
|
*/
|
|
#include <linux/smp.h>
|
|
#include <linux/bug.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/percpu.h>
|
|
#include <linux/hardirq.h>
|
|
#include <asm/qrwlock.h>
|
|
|
|
/*
|
|
* This internal data structure is used for optimizing access to some of
|
|
* the subfields within the atomic_t cnts.
|
|
*/
|
|
struct __qrwlock {
|
|
union {
|
|
atomic_t cnts;
|
|
struct {
|
|
#ifdef __LITTLE_ENDIAN
|
|
u8 wmode; /* Writer mode */
|
|
u8 rcnts[3]; /* Reader counts */
|
|
#else
|
|
u8 rcnts[3]; /* Reader counts */
|
|
u8 wmode; /* Writer mode */
|
|
#endif
|
|
};
|
|
};
|
|
arch_spinlock_t lock;
|
|
};
|
|
|
|
/**
|
|
* rspin_until_writer_unlock - inc reader count & spin until writer is gone
|
|
* @lock : Pointer to queue rwlock structure
|
|
* @writer: Current queue rwlock writer status byte
|
|
*
|
|
* In interrupt context or at the head of the queue, the reader will just
|
|
* increment the reader count & wait until the writer releases the lock.
|
|
*/
|
|
static __always_inline void
|
|
rspin_until_writer_unlock(struct qrwlock *lock, u32 cnts)
|
|
{
|
|
while ((cnts & _QW_WMASK) == _QW_LOCKED) {
|
|
cpu_relax_lowlatency();
|
|
cnts = smp_load_acquire((u32 *)&lock->cnts);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* queued_read_lock_slowpath - acquire read lock of a queue rwlock
|
|
* @lock: Pointer to queue rwlock structure
|
|
* @cnts: Current qrwlock lock value
|
|
*/
|
|
void queued_read_lock_slowpath(struct qrwlock *lock, u32 cnts)
|
|
{
|
|
/*
|
|
* Readers come here when they cannot get the lock without waiting
|
|
*/
|
|
if (unlikely(in_interrupt())) {
|
|
/*
|
|
* Readers in interrupt context will get the lock immediately
|
|
* if the writer is just waiting (not holding the lock yet).
|
|
* The rspin_until_writer_unlock() function returns immediately
|
|
* in this case. Otherwise, they will spin until the lock
|
|
* is available without waiting in the queue.
|
|
*/
|
|
rspin_until_writer_unlock(lock, cnts);
|
|
return;
|
|
}
|
|
atomic_sub(_QR_BIAS, &lock->cnts);
|
|
|
|
/*
|
|
* Put the reader into the wait queue
|
|
*/
|
|
arch_spin_lock(&lock->lock);
|
|
|
|
/*
|
|
* At the head of the wait queue now, increment the reader count
|
|
* and wait until the writer, if it has the lock, has gone away.
|
|
* At ths stage, it is not possible for a writer to remain in the
|
|
* waiting state (_QW_WAITING). So there won't be any deadlock.
|
|
*/
|
|
cnts = atomic_add_return(_QR_BIAS, &lock->cnts) - _QR_BIAS;
|
|
rspin_until_writer_unlock(lock, cnts);
|
|
|
|
/*
|
|
* Signal the next one in queue to become queue head
|
|
*/
|
|
arch_spin_unlock(&lock->lock);
|
|
}
|
|
EXPORT_SYMBOL(queued_read_lock_slowpath);
|
|
|
|
/**
|
|
* queued_write_lock_slowpath - acquire write lock of a queue rwlock
|
|
* @lock : Pointer to queue rwlock structure
|
|
*/
|
|
void queued_write_lock_slowpath(struct qrwlock *lock)
|
|
{
|
|
u32 cnts;
|
|
|
|
/* Put the writer into the wait queue */
|
|
arch_spin_lock(&lock->lock);
|
|
|
|
/* Try to acquire the lock directly if no reader is present */
|
|
if (!atomic_read(&lock->cnts) &&
|
|
(atomic_cmpxchg(&lock->cnts, 0, _QW_LOCKED) == 0))
|
|
goto unlock;
|
|
|
|
/*
|
|
* Set the waiting flag to notify readers that a writer is pending,
|
|
* or wait for a previous writer to go away.
|
|
*/
|
|
for (;;) {
|
|
struct __qrwlock *l = (struct __qrwlock *)lock;
|
|
|
|
if (!READ_ONCE(l->wmode) &&
|
|
(cmpxchg(&l->wmode, 0, _QW_WAITING) == 0))
|
|
break;
|
|
|
|
cpu_relax_lowlatency();
|
|
}
|
|
|
|
/* When no more readers, set the locked flag */
|
|
for (;;) {
|
|
cnts = atomic_read(&lock->cnts);
|
|
if ((cnts == _QW_WAITING) &&
|
|
(atomic_cmpxchg(&lock->cnts, _QW_WAITING,
|
|
_QW_LOCKED) == _QW_WAITING))
|
|
break;
|
|
|
|
cpu_relax_lowlatency();
|
|
}
|
|
unlock:
|
|
arch_spin_unlock(&lock->lock);
|
|
}
|
|
EXPORT_SYMBOL(queued_write_lock_slowpath);
|