Commit 71365d40 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

locking/percpu-rwsem: Move __this_cpu_inc() into the slowpath

As preparation to rework __percpu_down_read() move the
__this_cpu_inc() into it.
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Acked-by: default avatarWill Deacon <will@kernel.org>
Acked-by: default avatarWaiman Long <longman@redhat.com>
Tested-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Link: https://lkml.kernel.org/r/20200131151540.041600199@infradead.org
parent 206c98ff
...@@ -59,8 +59,9 @@ static inline void percpu_down_read(struct percpu_rw_semaphore *sem) ...@@ -59,8 +59,9 @@ static inline void percpu_down_read(struct percpu_rw_semaphore *sem)
* and that once the synchronize_rcu() is done, the writer will see * and that once the synchronize_rcu() is done, the writer will see
* anything we did within this RCU-sched read-size critical section. * anything we did within this RCU-sched read-size critical section.
*/ */
__this_cpu_inc(*sem->read_count); if (likely(rcu_sync_is_idle(&sem->rss)))
if (unlikely(!rcu_sync_is_idle(&sem->rss))) __this_cpu_inc(*sem->read_count);
else
__percpu_down_read(sem, false); /* Unconditional memory barrier */ __percpu_down_read(sem, false); /* Unconditional memory barrier */
/* /*
* The preempt_enable() prevents the compiler from * The preempt_enable() prevents the compiler from
...@@ -77,8 +78,9 @@ static inline bool percpu_down_read_trylock(struct percpu_rw_semaphore *sem) ...@@ -77,8 +78,9 @@ static inline bool percpu_down_read_trylock(struct percpu_rw_semaphore *sem)
/* /*
* Same as in percpu_down_read(). * Same as in percpu_down_read().
*/ */
__this_cpu_inc(*sem->read_count); if (likely(rcu_sync_is_idle(&sem->rss)))
if (unlikely(!rcu_sync_is_idle(&sem->rss))) __this_cpu_inc(*sem->read_count);
else
ret = __percpu_down_read(sem, true); /* Unconditional memory barrier */ ret = __percpu_down_read(sem, true); /* Unconditional memory barrier */
preempt_enable(); preempt_enable();
/* /*
......
...@@ -47,6 +47,8 @@ EXPORT_SYMBOL_GPL(percpu_free_rwsem); ...@@ -47,6 +47,8 @@ EXPORT_SYMBOL_GPL(percpu_free_rwsem);
bool __percpu_down_read(struct percpu_rw_semaphore *sem, bool try) bool __percpu_down_read(struct percpu_rw_semaphore *sem, bool try)
{ {
__this_cpu_inc(*sem->read_count);
/* /*
* Due to having preemption disabled the decrement happens on * Due to having preemption disabled the decrement happens on
* the same CPU as the increment, avoiding the * the same CPU as the increment, avoiding the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment