[irqchip:,irq/irqchip-fixes] irqchip/gic-v3: Workaround inconsistent PMR setting on NMI entry
diff mbox series

Message ID 162334353698.29796.16060603253543221581.tip-bot2@tip-bot2
State Accepted
Commit 382e6e177bc1c02473e56591fe5083ae1e4904f6
Headers show
  • [irqchip:,irq/irqchip-fixes] irqchip/gic-v3: Workaround inconsistent PMR setting on NMI entry
Related show

Commit Message

irqchip-bot for Andy Shevchenko June 10, 2021, 4:45 p.m. UTC
The following commit has been merged into the irq/irqchip-fixes branch of irqchip:

Commit-ID:     f6f3e6e9b362363d6eb303982d6302a1d43312c9
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/f6f3e6e9b362363d6eb303982d6302a1d43312c9
Author:        Marc Zyngier <maz@kernel.org>
AuthorDate:    Thu, 10 Jun 2021 15:13:46 +01:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Thu, 10 Jun 2021 17:42:21 +01:00

irqchip/gic-v3: Workaround inconsistent PMR setting on NMI entry

The arm64 entry code suffers from an annoying issue on taking
a NMI, as it sets PMR to a value that actually allows IRQs
to be acknowledged. This is done for consistency with other parts
of the code, and is in the process of being fixed. This shouldn't
be a problem, as we are not enabling interrupts whilst in NMI

However, in the infortunate scenario that we took a spurious NMI
(retired before the read of IAR) *and* that there is an IRQ pending
at the same time, we'll ack the IRQ in NMI context. Too bad.

In order to avoid deadlocks while running something like perf,
teach the GICv3 driver about this situation: if we were in
a context where no interrupt should have fired, transiently
set PMR to a value that only allows NMIs before acking the pending
interrupt, and restore the original value after that.

This papers over the core issue for the time being, and makes
NMIs great again. Sort of.

Fixes: 4d6a38da8e79e94c ("arm64: entry: always set GIC_PRIO_PSR_I_SET during entry")
Co-developed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/lkml/20210610145731.1350460-1-maz@kernel.org
 drivers/irqchip/irq-gic-v3.c | 36 ++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 37a23aa..66d623f 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -642,11 +642,45 @@  static inline void gic_handle_nmi(u32 irqnr, struct pt_regs *regs)
+static u32 do_read_iar(struct pt_regs *regs)
+	u32 iar;
+	if (gic_supports_nmi() && unlikely(!interrupts_enabled(regs))) {
+		u64 pmr;
+		/*
+		 * We were in a context with IRQs disabled. However, the
+		 * entry code has set PMR to a value that allows any
+		 * interrupt to be acknowledged, and not just NMIs. This can
+		 * lead to surprising effects if the NMI has been retired in
+		 * the meantime, and that there is an IRQ pending. The IRQ
+		 * would then be taken in NMI context, something that nobody
+		 * wants to debug twice.
+		 *
+		 * Until we sort this, drop PMR again to a level that will
+		 * actually only allow NMIs before reading IAR, and then
+		 * restore it to what it was.
+		 */
+		pmr = gic_read_pmr();
+		gic_pmr_mask_irqs();
+		isb();
+		iar = gic_read_iar();
+		gic_write_pmr(pmr);
+	} else {
+		iar = gic_read_iar();
+	}
+	return iar;
 static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
 	u32 irqnr;
-	irqnr = gic_read_iar();
+	irqnr = do_read_iar(regs);
 	/* Check for special IDs first */
 	if ((irqnr >= 1020 && irqnr <= 1023))