Commit 89837eb4 authored by Yunsheng Lin's avatar Yunsheng Lin Committed by David S. Miller

net: sched: add barrier to ensure correct ordering for lockless qdisc

The spin_trylock() was assumed to contain the implicit
barrier needed to ensure the correct ordering between
STATE_MISSED setting/clearing and STATE_MISSED checking
in commit a90c57f2 ("net: sched: fix packet stuck
problem for lockless qdisc").

But it turns out that spin_trylock() only has load-acquire
semantic, for strongly-ordered system(like x86), the compiler
barrier implicitly contained in spin_trylock() seems enough
to ensure the correct ordering. But for weakly-orderly system
(like arm64), the store-release semantic is needed to ensure
the correct ordering as clear_bit() and test_bit() is store
operation, see queued_spin_lock().

So add the explicit barrier to ensure the correct ordering
for the above case.

Fixes: a90c57f2 ("net: sched: fix packet stuck problem for lockless qdisc")
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 603113c5
...@@ -163,6 +163,12 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc) ...@@ -163,6 +163,12 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
if (spin_trylock(&qdisc->seqlock)) if (spin_trylock(&qdisc->seqlock))
goto nolock_empty; goto nolock_empty;
/* Paired with smp_mb__after_atomic() to make sure
* STATE_MISSED checking is synchronized with clearing
* in pfifo_fast_dequeue().
*/
smp_mb__before_atomic();
/* If the MISSED flag is set, it means other thread has /* If the MISSED flag is set, it means other thread has
* set the MISSED flag before second spin_trylock(), so * set the MISSED flag before second spin_trylock(), so
* we can return false here to avoid multi cpus doing * we can return false here to avoid multi cpus doing
...@@ -180,6 +186,12 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc) ...@@ -180,6 +186,12 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
*/ */
set_bit(__QDISC_STATE_MISSED, &qdisc->state); set_bit(__QDISC_STATE_MISSED, &qdisc->state);
/* spin_trylock() only has load-acquire semantic, so use
* smp_mb__after_atomic() to ensure STATE_MISSED is set
* before doing the second spin_trylock().
*/
smp_mb__after_atomic();
/* Retry again in case other CPU may not see the new flag /* Retry again in case other CPU may not see the new flag
* after it releases the lock at the end of qdisc_run_end(). * after it releases the lock at the end of qdisc_run_end().
*/ */
......
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