All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/6] powerpc/64: fix irq replay missing preempt
@ 2020-09-15 11:46 Nicholas Piggin
  2020-09-15 11:46 ` [PATCH 2/6] powerpc/64: fix irq replay pt_regs->softe value Nicholas Piggin
                   ` (5 more replies)
  0 siblings, 6 replies; 8+ messages in thread
From: Nicholas Piggin @ 2020-09-15 11:46 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: Nicholas Piggin

Prior to commit 3282a3da25bd ("powerpc/64: Implement soft interrupt
replay in C"), replayed interrupts returned by the regular interrupt
exit code, which performs preemption in case an interrupt had set
need_resched.

This logic was missed by the conversion. Adding preempt_disable/enable
around the interrupt replay and final irq enable will reschedule if
needed.

Fixes: 3282a3da25bd ("powerpc/64: Implement soft interrupt replay in C")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kernel/irq.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index bf21ebd36190..77019699606a 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -368,6 +368,12 @@ notrace void arch_local_irq_restore(unsigned long mask)
 		}
 	}
 
+	/*
+	 * Disable preempt here, so that the below preempt_enable will
+	 * perform resched if required (a replayed interrupt may set
+	 * need_resched).
+	 */
+	preempt_disable();
 	irq_soft_mask_set(IRQS_ALL_DISABLED);
 	trace_hardirqs_off();
 
@@ -377,6 +383,7 @@ notrace void arch_local_irq_restore(unsigned long mask)
 	trace_hardirqs_on();
 	irq_soft_mask_set(IRQS_ENABLED);
 	__hard_irq_enable();
+	preempt_enable();
 }
 EXPORT_SYMBOL(arch_local_irq_restore);
 
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-10-07  3:34 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-15 11:46 [PATCH 1/6] powerpc/64: fix irq replay missing preempt Nicholas Piggin
2020-09-15 11:46 ` [PATCH 2/6] powerpc/64: fix irq replay pt_regs->softe value Nicholas Piggin
2020-09-15 11:46 ` [PATCH 3/6] powerpc/64e: remove PACA_IRQ_EE_EDGE Nicholas Piggin
2020-09-15 11:46 ` [PATCH 4/6] powerpc/64e: remove 64s specific interrupt soft-mask code Nicholas Piggin
2020-09-15 11:46 ` [PATCH 5/6] powerpc/64: make restore_interrupts 64e only Nicholas Piggin
2020-09-15 11:46 ` [PATCH 6/6] powerpc/64: irq replay remove decrementer overflow check Nicholas Piggin
2020-09-18 12:06   ` Michael Ellerman
2020-10-07  3:21 ` [PATCH 1/6] powerpc/64: fix irq replay missing preempt Michael Ellerman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.