mirror of https://github.com/torvalds/linux.git
softirq: Provide a handshake for canceling tasklets via polling
The tasklet_unlock_spin_wait() via tasklet_disable_in_atomic() is provided for a few legacy tasklet users. The interface is used from atomic context (which is either softirq or disabled preemption) on non-PREEMPT_RT and relies on spinning until the tasklet callback completes. On PREEMPT_RT the context is never atomic but the busy polling logic remains. It is possible that the thread invoking tasklet_unlock_spin_wait() has higher priority than the tasklet. If both run on the same CPU the the tasklet makes no progress and the thread trying to cancel the tasklet will live-lock the system. To avoid the lockup tasklet_unlock_spin_wait() uses local_bh_disable()/ enable() which utilizes the local_lock_t for synchronisation. This lock is a central per-CPU BKL and about to be removed. Solve this by acquire a lock in tasklet_action_common() which is held while the tasklet's callback is invoked. This lock will be acquired from tasklet_unlock_spin_wait() via tasklet_callback_cancel_wait_running(). After the tasklet completed tasklet_callback_sync_wait_running() drops the lock and acquires it again. In order to avoid unlocking the lock even if there is no cancel request, there is a cb_waiters counter which is incremented during a cancel request. Blocking on the lock will PI-boost the tasklet if needed, ensuring progress is made. Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
8ad25ebfa7
commit
fd4e876f59
|
|
@ -805,6 +805,58 @@ static bool tasklet_clear_sched(struct tasklet_struct *t)
|
|||
return false;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PREEMPT_RT
|
||||
struct tasklet_sync_callback {
|
||||
spinlock_t cb_lock;
|
||||
atomic_t cb_waiters;
|
||||
};
|
||||
|
||||
static DEFINE_PER_CPU(struct tasklet_sync_callback, tasklet_sync_callback) = {
|
||||
.cb_lock = __SPIN_LOCK_UNLOCKED(tasklet_sync_callback.cb_lock),
|
||||
.cb_waiters = ATOMIC_INIT(0),
|
||||
};
|
||||
|
||||
static void tasklet_lock_callback(void)
|
||||
{
|
||||
spin_lock(this_cpu_ptr(&tasklet_sync_callback.cb_lock));
|
||||
}
|
||||
|
||||
static void tasklet_unlock_callback(void)
|
||||
{
|
||||
spin_unlock(this_cpu_ptr(&tasklet_sync_callback.cb_lock));
|
||||
}
|
||||
|
||||
static void tasklet_callback_cancel_wait_running(void)
|
||||
{
|
||||
struct tasklet_sync_callback *sync_cb = this_cpu_ptr(&tasklet_sync_callback);
|
||||
|
||||
atomic_inc(&sync_cb->cb_waiters);
|
||||
spin_lock(&sync_cb->cb_lock);
|
||||
atomic_dec(&sync_cb->cb_waiters);
|
||||
spin_unlock(&sync_cb->cb_lock);
|
||||
}
|
||||
|
||||
static void tasklet_callback_sync_wait_running(void)
|
||||
{
|
||||
struct tasklet_sync_callback *sync_cb = this_cpu_ptr(&tasklet_sync_callback);
|
||||
|
||||
if (atomic_read(&sync_cb->cb_waiters)) {
|
||||
spin_unlock(&sync_cb->cb_lock);
|
||||
spin_lock(&sync_cb->cb_lock);
|
||||
}
|
||||
}
|
||||
|
||||
#else /* !CONFIG_PREEMPT_RT: */
|
||||
|
||||
static void tasklet_lock_callback(void) { }
|
||||
static void tasklet_unlock_callback(void) { }
|
||||
static void tasklet_callback_sync_wait_running(void) { }
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
static void tasklet_callback_cancel_wait_running(void) { }
|
||||
#endif
|
||||
#endif /* !CONFIG_PREEMPT_RT */
|
||||
|
||||
static void tasklet_action_common(struct tasklet_head *tl_head,
|
||||
unsigned int softirq_nr)
|
||||
{
|
||||
|
|
@ -816,6 +868,7 @@ static void tasklet_action_common(struct tasklet_head *tl_head,
|
|||
tl_head->tail = &tl_head->head;
|
||||
local_irq_enable();
|
||||
|
||||
tasklet_lock_callback();
|
||||
while (list) {
|
||||
struct tasklet_struct *t = list;
|
||||
|
||||
|
|
@ -835,6 +888,7 @@ static void tasklet_action_common(struct tasklet_head *tl_head,
|
|||
}
|
||||
}
|
||||
tasklet_unlock(t);
|
||||
tasklet_callback_sync_wait_running();
|
||||
continue;
|
||||
}
|
||||
tasklet_unlock(t);
|
||||
|
|
@ -847,6 +901,7 @@ static void tasklet_action_common(struct tasklet_head *tl_head,
|
|||
__raise_softirq_irqoff(softirq_nr);
|
||||
local_irq_enable();
|
||||
}
|
||||
tasklet_unlock_callback();
|
||||
}
|
||||
|
||||
static __latent_entropy void tasklet_action(void)
|
||||
|
|
@ -897,12 +952,9 @@ void tasklet_unlock_spin_wait(struct tasklet_struct *t)
|
|||
/*
|
||||
* 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.
|
||||
* running.
|
||||
*/
|
||||
local_bh_disable();
|
||||
local_bh_enable();
|
||||
tasklet_callback_cancel_wait_running();
|
||||
} else {
|
||||
cpu_relax();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue