forked from Minki/linux
46ad0840b1
As the generic rwsem-xadd code is using the appropriate acquire and release versions of the atomic operations, the arch specific rwsem.h files will not be that much faster than the generic code as long as the atomic functions are properly implemented. So we can remove those arch specific rwsem.h and stop building asm/rwsem.h to reduce maintenance effort. Currently, only x86, alpha and ia64 have implemented architecture specific fast paths. I don't have access to alpha and ia64 systems for testing, but they are legacy systems that are not likely to be updated to the latest kernel anyway. By using a rwsem microbenchmark, the total locking rates on a 4-socket 56-core 112-thread x86-64 system before and after the patch were as follows (mixed means equal # of read and write locks): Before Patch After Patch # of Threads wlock rlock mixed wlock rlock mixed ------------ ----- ----- ----- ----- ----- ----- 1 29,201 30,143 29,458 28,615 30,172 29,201 2 6,807 13,299 1,171 7,725 15,025 1,804 4 6,504 12,755 1,520 7,127 14,286 1,345 8 6,762 13,412 764 6,826 13,652 726 16 6,693 15,408 662 6,599 15,938 626 32 6,145 15,286 496 5,549 15,487 511 64 5,812 15,495 60 5,858 15,572 60 There were some run-to-run variations for the multi-thread tests. For x86-64, using the generic C code fast path seems to be a little bit faster than the assembly version with low lock contention. Looking at the assembly version of the fast paths, there are assembly to/from C code wrappers that save and restore all the callee-clobbered registers (7 registers on x86-64). The assembly generated from the generic C code doesn't need to do that. That may explain the slight performance gain here. The generic asm rwsem.h can also be merged into kernel/locking/rwsem.h with no code change as no other code other than those under kernel/locking needs to access the internal rwsem macros and functions. Signed-off-by: Waiman Long <longman@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Borislav Petkov <bp@alien8.de> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tim Chen <tim.c.chen@linux.intel.com> Cc: Will Deacon <will.deacon@arm.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-c6x-dev@linux-c6x.org Cc: linux-m68k@lists.linux-m68k.org Cc: linux-riscv@lists.infradead.org Cc: linux-um@lists.infradead.org Cc: linux-xtensa@linux-xtensa.org Cc: linuxppc-dev@lists.ozlabs.org Cc: nios2-dev@lists.rocketboards.org Cc: openrisc@lists.librecores.org Cc: uclinux-h8-devel@lists.sourceforge.jp Link: https://lkml.kernel.org/r/20190322143008.21313-2-longman@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
195 lines
5.1 KiB
C
195 lines
5.1 KiB
C
#include <linux/atomic.h>
|
|
#include <linux/rwsem.h>
|
|
#include <linux/percpu.h>
|
|
#include <linux/lockdep.h>
|
|
#include <linux/percpu-rwsem.h>
|
|
#include <linux/rcupdate.h>
|
|
#include <linux/sched.h>
|
|
#include <linux/errno.h>
|
|
|
|
#include "rwsem.h"
|
|
|
|
int __percpu_init_rwsem(struct percpu_rw_semaphore *sem,
|
|
const char *name, struct lock_class_key *rwsem_key)
|
|
{
|
|
sem->read_count = alloc_percpu(int);
|
|
if (unlikely(!sem->read_count))
|
|
return -ENOMEM;
|
|
|
|
/* ->rw_sem represents the whole percpu_rw_semaphore for lockdep */
|
|
rcu_sync_init(&sem->rss, RCU_SCHED_SYNC);
|
|
__init_rwsem(&sem->rw_sem, name, rwsem_key);
|
|
rcuwait_init(&sem->writer);
|
|
sem->readers_block = 0;
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__percpu_init_rwsem);
|
|
|
|
void percpu_free_rwsem(struct percpu_rw_semaphore *sem)
|
|
{
|
|
/*
|
|
* XXX: temporary kludge. The error path in alloc_super()
|
|
* assumes that percpu_free_rwsem() is safe after kzalloc().
|
|
*/
|
|
if (!sem->read_count)
|
|
return;
|
|
|
|
rcu_sync_dtor(&sem->rss);
|
|
free_percpu(sem->read_count);
|
|
sem->read_count = NULL; /* catch use after free bugs */
|
|
}
|
|
EXPORT_SYMBOL_GPL(percpu_free_rwsem);
|
|
|
|
int __percpu_down_read(struct percpu_rw_semaphore *sem, int try)
|
|
{
|
|
/*
|
|
* Due to having preemption disabled the decrement happens on
|
|
* the same CPU as the increment, avoiding the
|
|
* increment-on-one-CPU-and-decrement-on-another problem.
|
|
*
|
|
* If the reader misses the writer's assignment of readers_block, then
|
|
* the writer is guaranteed to see the reader's increment.
|
|
*
|
|
* Conversely, any readers that increment their sem->read_count after
|
|
* the writer looks are guaranteed to see the readers_block value,
|
|
* which in turn means that they are guaranteed to immediately
|
|
* decrement their sem->read_count, so that it doesn't matter that the
|
|
* writer missed them.
|
|
*/
|
|
|
|
smp_mb(); /* A matches D */
|
|
|
|
/*
|
|
* If !readers_block the critical section starts here, matched by the
|
|
* release in percpu_up_write().
|
|
*/
|
|
if (likely(!smp_load_acquire(&sem->readers_block)))
|
|
return 1;
|
|
|
|
/*
|
|
* Per the above comment; we still have preemption disabled and
|
|
* will thus decrement on the same CPU as we incremented.
|
|
*/
|
|
__percpu_up_read(sem);
|
|
|
|
if (try)
|
|
return 0;
|
|
|
|
/*
|
|
* We either call schedule() in the wait, or we'll fall through
|
|
* and reschedule on the preempt_enable() in percpu_down_read().
|
|
*/
|
|
preempt_enable_no_resched();
|
|
|
|
/*
|
|
* Avoid lockdep for the down/up_read() we already have them.
|
|
*/
|
|
__down_read(&sem->rw_sem);
|
|
this_cpu_inc(*sem->read_count);
|
|
__up_read(&sem->rw_sem);
|
|
|
|
preempt_disable();
|
|
return 1;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__percpu_down_read);
|
|
|
|
void __percpu_up_read(struct percpu_rw_semaphore *sem)
|
|
{
|
|
smp_mb(); /* B matches C */
|
|
/*
|
|
* In other words, if they see our decrement (presumably to aggregate
|
|
* zero, as that is the only time it matters) they will also see our
|
|
* critical section.
|
|
*/
|
|
__this_cpu_dec(*sem->read_count);
|
|
|
|
/* Prod writer to recheck readers_active */
|
|
rcuwait_wake_up(&sem->writer);
|
|
}
|
|
EXPORT_SYMBOL_GPL(__percpu_up_read);
|
|
|
|
#define per_cpu_sum(var) \
|
|
({ \
|
|
typeof(var) __sum = 0; \
|
|
int cpu; \
|
|
compiletime_assert_atomic_type(__sum); \
|
|
for_each_possible_cpu(cpu) \
|
|
__sum += per_cpu(var, cpu); \
|
|
__sum; \
|
|
})
|
|
|
|
/*
|
|
* Return true if the modular sum of the sem->read_count per-CPU variable is
|
|
* zero. If this sum is zero, then it is stable due to the fact that if any
|
|
* newly arriving readers increment a given counter, they will immediately
|
|
* decrement that same counter.
|
|
*/
|
|
static bool readers_active_check(struct percpu_rw_semaphore *sem)
|
|
{
|
|
if (per_cpu_sum(*sem->read_count) != 0)
|
|
return false;
|
|
|
|
/*
|
|
* If we observed the decrement; ensure we see the entire critical
|
|
* section.
|
|
*/
|
|
|
|
smp_mb(); /* C matches B */
|
|
|
|
return true;
|
|
}
|
|
|
|
void percpu_down_write(struct percpu_rw_semaphore *sem)
|
|
{
|
|
/* Notify readers to take the slow path. */
|
|
rcu_sync_enter(&sem->rss);
|
|
|
|
down_write(&sem->rw_sem);
|
|
|
|
/*
|
|
* Notify new readers to block; up until now, and thus throughout the
|
|
* longish rcu_sync_enter() above, new readers could still come in.
|
|
*/
|
|
WRITE_ONCE(sem->readers_block, 1);
|
|
|
|
smp_mb(); /* D matches A */
|
|
|
|
/*
|
|
* If they don't see our writer of readers_block, then we are
|
|
* guaranteed to see their sem->read_count increment, and therefore
|
|
* will wait for them.
|
|
*/
|
|
|
|
/* Wait for all now active readers to complete. */
|
|
rcuwait_wait_event(&sem->writer, readers_active_check(sem));
|
|
}
|
|
EXPORT_SYMBOL_GPL(percpu_down_write);
|
|
|
|
void percpu_up_write(struct percpu_rw_semaphore *sem)
|
|
{
|
|
/*
|
|
* Signal the writer is done, no fast path yet.
|
|
*
|
|
* One reason that we cannot just immediately flip to readers_fast is
|
|
* that new readers might fail to see the results of this writer's
|
|
* critical section.
|
|
*
|
|
* Therefore we force it through the slow path which guarantees an
|
|
* acquire and thereby guarantees the critical section's consistency.
|
|
*/
|
|
smp_store_release(&sem->readers_block, 0);
|
|
|
|
/*
|
|
* Release the write lock, this will allow readers back in the game.
|
|
*/
|
|
up_write(&sem->rw_sem);
|
|
|
|
/*
|
|
* Once this completes (at least one RCU-sched grace period hence) the
|
|
* reader fast path will be available again. Safe to use outside the
|
|
* exclusive write lock because its counting.
|
|
*/
|
|
rcu_sync_exit(&sem->rss);
|
|
}
|
|
EXPORT_SYMBOL_GPL(percpu_up_write);
|