linux-kernel - [irqchip: irq/irqchip-fixes] irqchip/sifive-plic: Fixup EOI failed when masked

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 06 Nov 2021 14:26:58 -0000
From:   "irqchip-bot for Guo Ren" <tip-bot2@...utronix.de>
To:     linux-kernel@...r.kernel.org
Cc:     Vincent Pelletier <plr.vincent@...il.com>,
        Nikita Shubin <nikita.shubin@...uefel.me>,
        Guo Ren <guoren@...ux.alibaba.com>, stable@...r.kernel.org,
        Thomas Gleixner <tglx@...utronix.de>,
        Palmer Dabbelt <palmer@...belt.com>,
        Atish Patra <atish.patra@....com>,
        Anup Patel <anup@...infault.org>, Marc Zyngier <maz@...nel.org>
Subject: [irqchip: irq/irqchip-fixes] irqchip/sifive-plic: Fixup EOI failed
 when masked

The following commit has been merged into the irq/irqchip-fixes branch of irqchip:

Commit-ID:     4d7a0f5ebd8df659d78122c350283a84a36c2e05
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/4d7a0f5ebd8df659d78122c350283a84a36c2e05
Author:        Guo Ren <guoren@...ux.alibaba.com>
AuthorDate:    Fri, 05 Nov 2021 17:47:48 +08:00
Committer:     Marc Zyngier <maz@...nel.org>
CommitterDate: Sat, 06 Nov 2021 14:24:49 

irqchip/sifive-plic: Fixup EOI failed when masked

When using "devm_request_threaded_irq(,,,,IRQF_ONESHOT,,)" in a driver,
only the first interrupt is handled, and following interrupts are never
delivered (initially reported in [1]).

That's because the RISC-V PLIC cannot EOI masked interrupts, as explained
in the description of Interrupt Completion in the PLIC spec [2]:

<quote>
The PLIC signals it has completed executing an interrupt handler by
writing the interrupt ID it received from the claim to the claim/complete
register. The PLIC does not check whether the completion ID is the same
as the last claim ID for that target. If the completion ID does not match
an interrupt source that *is currently enabled* for the target, the
completion is silently ignored.
</quote>

Re-enable the interrupt before completion if it has been masked during
the handling, and remask it afterwards.

[1] http://lists.infradead.org/pipermail/linux-riscv/2021-July/007441.html
[2] https://github.com/riscv/riscv-plic-spec/blob/8bc15a35d07c9edf7b5d23fec9728302595ffc4d/riscv-plic.adoc

Fixes: bb0fed1c60cc ("irqchip/sifive-plic: Switch to fasteoi flow")
Reported-by: Vincent Pelletier <plr.vincent@...il.com>
Tested-by: Nikita Shubin <nikita.shubin@...uefel.me>
Signed-off-by: Guo Ren <guoren@...ux.alibaba.com>
Cc: stable@...r.kernel.org
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Palmer Dabbelt <palmer@...belt.com>
Cc: Atish Patra <atish.patra@....com>
Reviewed-by: Anup Patel <anup@...infault.org>
[maz: amended commit message]
Signed-off-by: Marc Zyngier <maz@...nel.org>
Link: https://lore.kernel.org/r/20211105094748.3894453-1-guoren@kernel.org
---
 drivers/irqchip/irq-sifive-plic.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/irqchip/irq-sifive-plic.c b/drivers/irqchip/irq-sifive-plic.c
index cf74cfa..259065d 100644
--- a/drivers/irqchip/irq-sifive-plic.c
+++ b/drivers/irqchip/irq-sifive-plic.c
@@ -163,7 +163,13 @@ static void plic_irq_eoi(struct irq_data *d)
 {
 	struct plic_handler *handler = this_cpu_ptr(&plic_handlers);
 
-	writel(d->hwirq, handler->hart_base + CONTEXT_CLAIM);
+	if (irqd_irq_masked(d)) {
+		plic_irq_unmask(d);
+		writel(d->hwirq, handler->hart_base + CONTEXT_CLAIM);
+		plic_irq_mask(d);
+	} else {
+		writel(d->hwirq, handler->hart_base + CONTEXT_CLAIM);
+	}
 }
 
 static struct irq_chip plic_chip = {