lkml.org 
[lkml]   [2020]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch V2 9/9] tasklets: Prevent kill/unlock_wait deadlock on RT
    From: Thomas Gleixner <tglx@linutronix.de>

    tasklet_kill() and tasklet_unlock_wait() spin and wait for the
    TASKLET_STATE_SCHED resp. TASKLET_STATE_RUN bit in the tasklet state to be
    cleared. This works on !RT nicely because the corresponding execution can
    only happen on a different CPU.

    On RT softirq processing is preemptible, therefore a task preempting the
    softirq processing thread can spin forever.

    Prevent this by invoking local_bh_disable()/enable() inside the loop. In
    case that the softirq processing thread was preempted by the current task,
    current will block on the local lock which yields the CPU to the preempted
    softirq processing thread. If the tasklet is processed on a different CPU
    then the local_bh_disable()/enable() pair is just a waste of processor
    cycles.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    include/linux/interrupt.h | 8 ++------
    kernel/softirq.c | 38 +++++++++++++++++++++++++++++++++++++-
    2 files changed, 39 insertions(+), 7 deletions(-)

    --- a/include/linux/interrupt.h
    +++ b/include/linux/interrupt.h
    @@ -654,7 +654,7 @@ enum
    TASKLET_STATE_RUN /* Tasklet is running (SMP only) */
    };

    -#ifdef CONFIG_SMP
    +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT)
    static inline int tasklet_trylock(struct tasklet_struct *t)
    {
    return !test_and_set_bit(TASKLET_STATE_RUN, &(t)->state);
    @@ -666,11 +666,7 @@ static inline void tasklet_unlock(struct
    clear_bit(TASKLET_STATE_RUN, &(t)->state);
    }

    -static inline void tasklet_unlock_wait(struct tasklet_struct *t)
    -{
    - while (test_bit(TASKLET_STATE_RUN, &(t)->state))
    - cpu_relax();
    -}
    +void tasklet_unlock_wait(struct tasklet_struct *t);
    #else
    static inline int tasklet_trylock(struct tasklet_struct *t) { return 1; }
    static inline void tasklet_unlock(struct tasklet_struct *t) { }
    --- a/kernel/softirq.c
    +++ b/kernel/softirq.c
    @@ -818,6 +818,29 @@ void tasklet_init(struct tasklet_struct
    }
    EXPORT_SYMBOL(tasklet_init);

    +#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT)
    +
    +void tasklet_unlock_wait(struct tasklet_struct *t)
    +{
    + while (test_bit(TASKLET_STATE_RUN, &(t)->state)) {
    + if (IS_ENABLED(CONFIG_PREEMPT_RT)) {
    + /*
    + * Prevent a live lock when current preempted soft
    + * interrupt processing or prevents ksoftirqd from
    + * running. If the tasklet runs on a different CPU
    + * then this has no effect other than doing the BH
    + * disable/enable dance for nothing.
    + */
    + local_bh_disable();
    + local_bh_enable();
    + } else {
    + cpu_relax();
    + }
    + }
    +}
    +EXPORT_SYMBOL(tasklet_unlock_wait);
    +#endif
    +
    void tasklet_kill(struct tasklet_struct *t)
    {
    if (in_interrupt())
    @@ -825,7 +848,20 @@ void tasklet_kill(struct tasklet_struct

    while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) {
    do {
    - yield();
    + if (IS_ENABLED(CONFIG_PREEMPT_RT)) {
    + /*
    + * Prevent a live lock when current
    + * preempted soft interrupt processing or
    + * prevents ksoftirqd from running. If the
    + * tasklet runs on a different CPU then
    + * this has no effect other than doing the
    + * BH disable/enable dance for nothing.
    + */
    + local_bh_disable();
    + local_bh_enable();
    + } else {
    + yield();
    + }
    } while (test_bit(TASKLET_STATE_SCHED, &t->state));
    }
    tasklet_unlock_wait(t);
    \
     
     \ /
      Last update: 2020-12-04 18:12    [W:2.871 / U:23.796 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site