Commit 71c23502 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman

powerpc/qspinlock: use spin_begin/end API

Use the spin_begin/spin_cpu_relax/spin_end APIs in qspinlock, which helps
to prevent threads issuing a lot of expensive priority nops which may not
have much effect due to immediately executing low then medium priority.
Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20221126095932.1234527-14-npiggin@gmail.com
parent f61ab43c
...@@ -184,6 +184,7 @@ static struct qnode *get_tail_qnode(struct qspinlock *lock, u32 val) ...@@ -184,6 +184,7 @@ static struct qnode *get_tail_qnode(struct qspinlock *lock, u32 val)
BUG(); BUG();
} }
/* Called inside spin_begin() */
static __always_inline void __yield_to_locked_owner(struct qspinlock *lock, u32 val, bool paravirt, bool mustq) static __always_inline void __yield_to_locked_owner(struct qspinlock *lock, u32 val, bool paravirt, bool mustq)
{ {
int owner; int owner;
...@@ -203,6 +204,8 @@ static __always_inline void __yield_to_locked_owner(struct qspinlock *lock, u32 ...@@ -203,6 +204,8 @@ static __always_inline void __yield_to_locked_owner(struct qspinlock *lock, u32
if ((yield_count & 1) == 0) if ((yield_count & 1) == 0)
goto relax; /* owner vcpu is running */ goto relax; /* owner vcpu is running */
spin_end();
/* /*
* Read the lock word after sampling the yield count. On the other side * Read the lock word after sampling the yield count. On the other side
* there may a wmb because the yield count update is done by the * there may a wmb because the yield count update is done by the
...@@ -218,18 +221,22 @@ static __always_inline void __yield_to_locked_owner(struct qspinlock *lock, u32 ...@@ -218,18 +221,22 @@ static __always_inline void __yield_to_locked_owner(struct qspinlock *lock, u32
yield_to_preempted(owner, yield_count); yield_to_preempted(owner, yield_count);
if (mustq) if (mustq)
set_mustq(lock); set_mustq(lock);
spin_begin();
/* Don't relax if we yielded. Maybe we should? */ /* Don't relax if we yielded. Maybe we should? */
return; return;
} }
spin_begin();
relax: relax:
cpu_relax(); spin_cpu_relax();
} }
/* Called inside spin_begin() */
static __always_inline void yield_to_locked_owner(struct qspinlock *lock, u32 val, bool paravirt) static __always_inline void yield_to_locked_owner(struct qspinlock *lock, u32 val, bool paravirt)
{ {
__yield_to_locked_owner(lock, val, paravirt, false); __yield_to_locked_owner(lock, val, paravirt, false);
} }
/* Called inside spin_begin() */
static __always_inline void yield_head_to_locked_owner(struct qspinlock *lock, u32 val, bool paravirt) static __always_inline void yield_head_to_locked_owner(struct qspinlock *lock, u32 val, bool paravirt)
{ {
bool mustq = false; bool mustq = false;
...@@ -267,6 +274,7 @@ static __always_inline void propagate_yield_cpu(struct qnode *node, u32 val, int ...@@ -267,6 +274,7 @@ static __always_inline void propagate_yield_cpu(struct qnode *node, u32 val, int
} }
} }
/* Called inside spin_begin() */
static __always_inline void yield_to_prev(struct qspinlock *lock, struct qnode *node, u32 val, bool paravirt) static __always_inline void yield_to_prev(struct qspinlock *lock, struct qnode *node, u32 val, bool paravirt)
{ {
int prev_cpu = decode_tail_cpu(val); int prev_cpu = decode_tail_cpu(val);
...@@ -291,14 +299,18 @@ static __always_inline void yield_to_prev(struct qspinlock *lock, struct qnode * ...@@ -291,14 +299,18 @@ static __always_inline void yield_to_prev(struct qspinlock *lock, struct qnode *
if ((yield_count & 1) == 0) if ((yield_count & 1) == 0)
goto yield_prev; /* owner vcpu is running */ goto yield_prev; /* owner vcpu is running */
spin_end();
smp_rmb(); smp_rmb();
if (yield_cpu == node->yield_cpu) { if (yield_cpu == node->yield_cpu) {
if (node->next && node->next->yield_cpu != yield_cpu) if (node->next && node->next->yield_cpu != yield_cpu)
node->next->yield_cpu = yield_cpu; node->next->yield_cpu = yield_cpu;
yield_to_preempted(yield_cpu, yield_count); yield_to_preempted(yield_cpu, yield_count);
spin_begin();
return; return;
} }
spin_begin();
yield_prev: yield_prev:
if (!pv_yield_prev) if (!pv_yield_prev)
...@@ -308,15 +320,19 @@ static __always_inline void yield_to_prev(struct qspinlock *lock, struct qnode * ...@@ -308,15 +320,19 @@ static __always_inline void yield_to_prev(struct qspinlock *lock, struct qnode *
if ((yield_count & 1) == 0) if ((yield_count & 1) == 0)
goto relax; /* owner vcpu is running */ goto relax; /* owner vcpu is running */
spin_end();
smp_rmb(); /* See __yield_to_locked_owner comment */ smp_rmb(); /* See __yield_to_locked_owner comment */
if (!node->locked) { if (!node->locked) {
yield_to_preempted(prev_cpu, yield_count); yield_to_preempted(prev_cpu, yield_count);
spin_begin();
return; return;
} }
spin_begin();
relax: relax:
cpu_relax(); spin_cpu_relax();
} }
...@@ -328,6 +344,8 @@ static __always_inline bool try_to_steal_lock(struct qspinlock *lock, bool parav ...@@ -328,6 +344,8 @@ static __always_inline bool try_to_steal_lock(struct qspinlock *lock, bool parav
return false; return false;
/* Attempt to steal the lock */ /* Attempt to steal the lock */
spin_begin();
do { do {
u32 val = READ_ONCE(lock->val); u32 val = READ_ONCE(lock->val);
...@@ -335,8 +353,10 @@ static __always_inline bool try_to_steal_lock(struct qspinlock *lock, bool parav ...@@ -335,8 +353,10 @@ static __always_inline bool try_to_steal_lock(struct qspinlock *lock, bool parav
break; break;
if (unlikely(!(val & _Q_LOCKED_VAL))) { if (unlikely(!(val & _Q_LOCKED_VAL))) {
spin_end();
if (__queued_spin_trylock_steal(lock)) if (__queued_spin_trylock_steal(lock))
return true; return true;
spin_begin();
} else { } else {
yield_to_locked_owner(lock, val, paravirt); yield_to_locked_owner(lock, val, paravirt);
} }
...@@ -344,6 +364,8 @@ static __always_inline bool try_to_steal_lock(struct qspinlock *lock, bool parav ...@@ -344,6 +364,8 @@ static __always_inline bool try_to_steal_lock(struct qspinlock *lock, bool parav
iters++; iters++;
} while (iters < get_steal_spins(paravirt)); } while (iters < get_steal_spins(paravirt));
spin_end();
return false; return false;
} }
...@@ -395,8 +417,10 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b ...@@ -395,8 +417,10 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b
WRITE_ONCE(prev->next, node); WRITE_ONCE(prev->next, node);
/* Wait for mcs node lock to be released */ /* Wait for mcs node lock to be released */
spin_begin();
while (!node->locked) while (!node->locked)
yield_to_prev(lock, node, old, paravirt); yield_to_prev(lock, node, old, paravirt);
spin_end();
/* Clear out stale propagated yield_cpu */ /* Clear out stale propagated yield_cpu */
if (paravirt && pv_yield_propagate_owner && node->yield_cpu != -1) if (paravirt && pv_yield_propagate_owner && node->yield_cpu != -1)
...@@ -407,6 +431,7 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b ...@@ -407,6 +431,7 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b
again: again:
/* We're at the head of the waitqueue, wait for the lock. */ /* We're at the head of the waitqueue, wait for the lock. */
spin_begin();
for (;;) { for (;;) {
val = READ_ONCE(lock->val); val = READ_ONCE(lock->val);
if (!(val & _Q_LOCKED_VAL)) if (!(val & _Q_LOCKED_VAL))
...@@ -424,6 +449,7 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b ...@@ -424,6 +449,7 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b
val |= _Q_MUST_Q_VAL; val |= _Q_MUST_Q_VAL;
} }
} }
spin_end();
/* If we're the last queued, must clean up the tail. */ /* If we're the last queued, must clean up the tail. */
old = trylock_clean_tail(lock, tail); old = trylock_clean_tail(lock, tail);
...@@ -436,8 +462,13 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b ...@@ -436,8 +462,13 @@ static __always_inline void queued_spin_lock_mcs_queue(struct qspinlock *lock, b
goto release; /* We were the tail, no next. */ goto release; /* We were the tail, no next. */
/* There is a next, must wait for node->next != NULL (MCS protocol) */ /* There is a next, must wait for node->next != NULL (MCS protocol) */
while (!(next = READ_ONCE(node->next))) next = READ_ONCE(node->next);
cpu_relax(); if (!next) {
spin_begin();
while (!(next = READ_ONCE(node->next)))
cpu_relax();
spin_end();
}
/* /*
* Unlock the next mcs waiter node. Release barrier is not required * Unlock the next mcs waiter node. Release barrier is not required
......
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