Skip to content

Commit 09089db

Browse files
Sebastian Andrzej SiewiorPeter Zijlstra
Sebastian Andrzej Siewior
authored and
Peter Zijlstra
committed
irq_work: Also rcuwait for !IRQ_WORK_HARD_IRQ on PREEMPT_RT
On PREEMPT_RT most items are processed as LAZY via softirq context. Avoid to spin-wait for them because irq_work_sync() could have higher priority and not allow the irq-work to be completed. Wait additionally for !IRQ_WORK_HARD_IRQ irq_work items on PREEMPT_RT. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent b4c6f86 commit 09089db

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

include/linux/irq_work.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ static inline bool irq_work_is_busy(struct irq_work *work)
4949
return atomic_read(&work->node.a_flags) & IRQ_WORK_BUSY;
5050
}
5151

52+
static inline bool irq_work_is_hard(struct irq_work *work)
53+
{
54+
return atomic_read(&work->node.a_flags) & IRQ_WORK_HARD_IRQ;
55+
}
56+
5257
bool irq_work_queue(struct irq_work *work);
5358
bool irq_work_queue_on(struct irq_work *work, int cpu);
5459

kernel/irq_work.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,8 @@ void irq_work_single(void *arg)
217217
*/
218218
(void)atomic_cmpxchg(&work->node.a_flags, flags, flags & ~IRQ_WORK_BUSY);
219219

220-
if (!arch_irq_work_has_interrupt())
220+
if ((IS_ENABLED(CONFIG_PREEMPT_RT) && !irq_work_is_hard(work)) ||
221+
!arch_irq_work_has_interrupt())
221222
rcuwait_wake_up(&work->irqwait);
222223
}
223224

@@ -277,7 +278,8 @@ void irq_work_sync(struct irq_work *work)
277278
lockdep_assert_irqs_enabled();
278279
might_sleep();
279280

280-
if (!arch_irq_work_has_interrupt()) {
281+
if ((IS_ENABLED(CONFIG_PREEMPT_RT) && !irq_work_is_hard(work)) ||
282+
!arch_irq_work_has_interrupt()) {
281283
rcuwait_wait_event(&work->irqwait, !irq_work_is_busy(work),
282284
TASK_UNINTERRUPTIBLE);
283285
return;

0 commit comments

Comments
 (0)