tasklet: Fix UP case for tasklet CHAINED state
PATCH v2 1/1 tasklet: Fix UP case for tasklet CHAINED state
From: Tom Zanussi <[email protected]>
commit 62d0a2a30cd0 (tasklet: Address a race resulting in double-enqueue) addresses a problem that can result in a tasklet being enqueued on two cpus at the same time by combining the RUN flag with a new CHAINED flag, and relies on the combination to be present in order to zero it out, which can never happen on (!SMP and !PREEMPT_RT_FULL) because the RUN flag is SMP/PREEMPT_RT_FULL-only.
So make sure the above commit is only applied for the SMP || PREEMPT_RT_FULL case.
Fixes 62d0a2a30cd0 ("tasklet: Address a race resulting in double-enqueue")
Signed-off-by Tom Zanussi <[email protected]>
Reported-by Ramon Fried <[email protected]>
Tested-by Ramon Fried <[email protected]>
--- kernel/softirq.c | 6 ++++++ 1 file changed, 6 insertions(+)
kernel/softirq.c +6 -0
@@ -947,10 +947,12 @@ static void __tasklet_schedule_common(struct tasklet_struct *t,* is locked before adding it to the list. */ if (test_bit (TASKLET_STATE_SCHED , &t->state)) { +#if defined(CONFIG_SMP ) || defined(CONFIG_PREEMPT_RT_FULL )if (test_and_set_bit (TASKLET_STATE_CHAINED , &t->state)) {tasklet_unlock (t);return ; } +#endif t->next =NULL ; *head->tail = t; head->tail = &(t->next);
@@ -1044,7 +1046,11 @@ static void tasklet_action_common(struct softirq_action *a, again: t->func (t->data); +#if defined(CONFIG_SMP ) || defined(CONFIG_PREEMPT_RT_FULL )while (cmpxchg (&t->state,TASKLET_STATEF_RC ,0 ) !=TASKLET_STATEF_RC ) { +#else +while (!tasklet_tryunlock (t)) { +#endif /* * If it got disabled meanwhile, bail out: */
Signature · 1 line
2.17.1