lkml.org 
[lkml]   [2022]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 067/172] net: sched: add barrier to fix packet stuck problem for lockless qdisc
    Date
    From: Guoju Fang <gjfang@linux.alibaba.com>

    [ Upstream commit 2e8728c955ce0624b958eee6e030a37aca3a5d86 ]

    In qdisc_run_end(), the spin_unlock() only has store-release semantic,
    which guarantees all earlier memory access are visible before it. But
    the subsequent test_bit() has no barrier semantics so may be reordered
    ahead of the spin_unlock(). The store-load reordering may cause a packet
    stuck problem.

    The concurrent operations can be described as below,
    CPU 0 | CPU 1
    qdisc_run_end() | qdisc_run_begin()
    . | .
    ----> /* may be reorderd here */ | .
    | . | .
    | spin_unlock() | set_bit()
    | . | smp_mb__after_atomic()
    ---- test_bit() | spin_trylock()
    . | .

    Consider the following sequence of events:
    CPU 0 reorder test_bit() ahead and see MISSED = 0
    CPU 1 calls set_bit()
    CPU 1 calls spin_trylock() and return fail
    CPU 0 executes spin_unlock()

    At the end of the sequence, CPU 0 calls spin_unlock() and does nothing
    because it see MISSED = 0. The skb on CPU 1 has beed enqueued but no one
    take it, until the next cpu pushing to the qdisc (if ever ...) will
    notice and dequeue it.

    This patch fix this by adding one explicit barrier. As spin_unlock() and
    test_bit() ordering is a store-load ordering, a full memory barrier
    smp_mb() is needed here.

    Fixes: a90c57f2cedd ("net: sched: fix packet stuck problem for lockless qdisc")
    Signed-off-by: Guoju Fang <gjfang@linux.alibaba.com>
    Link: https://lore.kernel.org/r/20220528101628.120193-1-gjfang@linux.alibaba.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/net/sch_generic.h | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
    index 769764bda7a8..bed2387af456 100644
    --- a/include/net/sch_generic.h
    +++ b/include/net/sch_generic.h
    @@ -197,6 +197,12 @@ static inline void qdisc_run_end(struct Qdisc *qdisc)
    if (qdisc->flags & TCQ_F_NOLOCK) {
    spin_unlock(&qdisc->seqlock);

    + /* spin_unlock() only has store-release semantic. The unlock
    + * and test_bit() ordering is a store-load ordering, so a full
    + * memory barrier is needed here.
    + */
    + smp_mb();
    +
    if (unlikely(test_bit(__QDISC_STATE_MISSED,
    &qdisc->state))) {
    clear_bit(__QDISC_STATE_MISSED, &qdisc->state);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-13 14:41    [W:4.180 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site