From: Marc Zyngier <marc.zyngier@arm.com>
To: Julien Thierry <julien.thierry@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <daniel.thompson@linaro.org>,
<joel@joelfernandes.org>, <christoffer.dall@arm.com>,
<james.morse@arm.com>, <catalin.marinas@arm.com>,
<will.deacon@arm.com>, <mark.rutland@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>
Subject: Re: [PATCH v9 20/26] irqchip/gic-v3: Handle pseudo-NMIs
Date: Mon, 28 Jan 2019 11:59:36 +0000 [thread overview]
Message-ID: <86wompuh5j.wl-marc.zyngier@arm.com> (raw)
In-Reply-To: <1548084825-8803-21-git-send-email-julien.thierry@arm.com>
On Mon, 21 Jan 2019 15:33:39 +0000,
Julien Thierry <julien.thierry@arm.com> wrote:
>
> Provide a higher priority to be used for pseudo-NMIs. When such an
> interrupt is received, keep interrupts fully disabled at CPU level to
> prevent receiving other pseudo-NMIs while handling the current one.
>
> Signed-off-by: Julien Thierry <julien.thierry@arm.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> ---
> drivers/irqchip/irq-gic-v3.c | 42 ++++++++++++++++++++++++++++++++++++------
> 1 file changed, 36 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
> index 5374b43..4df1e94 100644
> --- a/drivers/irqchip/irq-gic-v3.c
> +++ b/drivers/irqchip/irq-gic-v3.c
> @@ -41,6 +41,8 @@
>
> #include "irq-gic-common.h"
>
> +#define GICD_INT_NMI_PRI (GICD_INT_DEF_PRI & ~0x80)
> +
> #define FLAGS_WORKAROUND_GICR_WAKER_MSM8996 (1ULL << 0)
>
> struct redist_region {
> @@ -381,12 +383,45 @@ static u64 gic_mpidr_to_affinity(unsigned long mpidr)
> return aff;
> }
>
> +static inline void gic_deactivate_unexpected_irq(u32 irqnr)
Same remark as on some other patches: you should be able to drop the
inline attribute without any ill effect. I'd also like this to be
renamed "gic_deactivate_spurious", or something similar.
> +{
> + if (static_branch_likely(&supports_deactivate_key)) {
> + if (irqnr < 8192)
> + gic_write_dir(irqnr);
> + } else {
> + gic_write_eoir(irqnr);
> + }
> +}
> +
> +static inline void gic_handle_nmi(u32 irqnr, struct pt_regs *regs)
> +{
> + int err;
> +
> + if (static_branch_likely(&supports_deactivate_key))
> + gic_write_eoir(irqnr);
> + /*
> + * Leave the PSR.I bit set to prevent other NMIs to be
> + * received while handling this one.
> + * PSR.I will be restored when we ERET to the
> + * interrupted context.
> + */
> + err = handle_domain_nmi(gic_data.domain, irqnr, regs);
So this is the point where we start having a dependency on the NMI
series. We definitely need to start talking merge strategy.
> + if (err)
> + gic_deactivate_unexpected_irq(irqnr);
> +}
> +
> static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs)
> {
> u32 irqnr;
>
> irqnr = gic_read_iar();
>
> + if (gic_supports_nmi() &&
> + unlikely(gic_read_rpr() == GICD_INT_NMI_PRI)) {
> + gic_handle_nmi(irqnr, regs);
> + return;
> + }
> +
> if (gic_prio_masking_enabled()) {
> gic_pmr_mask_irqs();
> gic_arch_enable_irqs();
> @@ -403,12 +438,7 @@ static asmlinkage void __exception_irq_entry gic_handle_irq(struct pt_regs *regs
> err = handle_domain_irq(gic_data.domain, irqnr, regs);
> if (err) {
> WARN_ONCE(true, "Unexpected interrupt received!\n");
> - if (static_branch_likely(&supports_deactivate_key)) {
> - if (irqnr < 8192)
> - gic_write_dir(irqnr);
> - } else {
> - gic_write_eoir(irqnr);
> - }
> + gic_deactivate_unexpected_irq(irqnr);
> }
> return;
> }
> --
> 1.9.1
>
With the above addressed,
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
M.
--
Jazz is not dead, it just smell funny.
next prev parent reply other threads:[~2019-01-28 11:59 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-21 15:33 [PATCH v9 00/26] arm64: provide pseudo NMI with GICv3 Julien Thierry
2019-01-21 15:33 ` [PATCH v9 01/26] arm64: Fix HCR.TGE status for NMI contexts Julien Thierry
2019-01-28 11:48 ` James Morse
2019-01-28 15:42 ` Julien Thierry
2019-01-31 8:19 ` Christoffer Dall
2019-01-31 8:56 ` Julien Thierry
2019-01-31 9:27 ` Christoffer Dall
2019-01-31 9:40 ` Julien Thierry
2019-01-31 9:48 ` Christoffer Dall
2019-01-31 9:53 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 02/26] arm64: Remove unused daif related functions/macros Julien Thierry
2019-01-28 9:21 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 03/26] arm64: cpufeature: Set SYSREG_GIC_CPUIF as a boot system feature Julien Thierry
2019-01-28 9:22 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 04/26] arm64: cpufeature: Add cpufeature for IRQ priority masking Julien Thierry
2019-01-28 9:24 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 05/26] arm/arm64: gic-v3: Add PMR and RPR accessors Julien Thierry
2019-01-28 9:25 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 06/26] irqchip/gic-v3: Switch to PMR masking before calling IRQ handler Julien Thierry
2019-01-28 9:30 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 07/26] arm64: ptrace: Provide definitions for PMR values Julien Thierry
2019-01-28 9:37 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 08/26] arm64: Make PMR part of task context Julien Thierry
2019-01-28 9:42 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 09/26] arm64: Unmask PMR before going idle Julien Thierry
2019-01-22 15:23 ` Catalin Marinas
2019-01-22 20:18 ` Ard Biesheuvel
2019-01-23 8:56 ` Julien Thierry
2019-01-23 9:38 ` Ard Biesheuvel
2019-01-28 9:44 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 10/26] arm64: kvm: Unmask PMR before entering guest Julien Thierry
2019-01-28 9:58 ` Marc Zyngier
2019-01-30 12:07 ` Christoffer Dall
2019-01-30 14:58 ` Julien Thierry
2019-01-21 15:33 ` [PATCH v9 11/26] efi: Let architectures decide the flags that should be saved/restored Julien Thierry
2019-01-21 15:42 ` Ard Biesheuvel
2019-01-23 9:04 ` Julien Thierry
2019-01-28 10:00 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 12/26] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Julien Thierry
2019-01-21 15:45 ` Ard Biesheuvel
2019-01-21 18:05 ` Julien Thierry
2019-01-22 15:21 ` Catalin Marinas
2019-01-23 10:44 ` Julien Thierry
2019-01-30 11:52 ` Julien Thierry
2019-01-21 15:33 ` [PATCH v9 13/26] arm64: daifflags: Include PMR in daifflags restore operations Julien Thierry
2019-01-28 10:37 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 14/26] arm64: alternative: Allow alternative status checking per cpufeature Julien Thierry
2019-01-28 11:00 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 15/26] arm64: alternative: Apply alternatives early in boot process Julien Thierry
2019-01-28 11:17 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 16/26] irqchip/gic-v3: Factor group0 detection into functions Julien Thierry
2019-01-28 11:19 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 17/26] arm64: Switch to PMR masking when starting CPUs Julien Thierry
2019-01-28 11:21 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 18/26] arm64: gic-v3: Implement arch support for priority masking Julien Thierry
2019-01-28 11:23 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 19/26] irqchip/gic-v3: Detect if GIC can support pseudo-NMIs Julien Thierry
2019-01-28 11:39 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 20/26] irqchip/gic-v3: Handle pseudo-NMIs Julien Thierry
2019-01-28 11:59 ` Marc Zyngier [this message]
2019-01-29 11:33 ` Julien Thierry
2019-01-29 12:31 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 21/26] irqchip/gic: Add functions to access irq priorities Julien Thierry
2019-01-28 12:04 ` Marc Zyngier
2019-01-29 11:36 ` Julien Thierry
2019-01-21 15:33 ` [PATCH v9 22/26] irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI Julien Thierry
2019-01-26 10:19 ` liwei (GF)
2019-01-26 10:41 ` Marc Zyngier
2019-01-28 8:57 ` Julien Thierry
2019-01-28 13:59 ` liwei (GF)
2019-01-28 14:49 ` Julien Thierry
2019-01-28 12:08 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 23/26] arm64: Handle serror in NMI context Julien Thierry
2019-01-28 12:26 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 24/26] arm64: Skip preemption when exiting an NMI Julien Thierry
2019-01-28 12:34 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 25/26] arm64: Skip irqflags tracing for NMI in IRQs disabled context Julien Thierry
2019-01-28 12:40 ` Marc Zyngier
2019-01-21 15:33 ` [PATCH v9 26/26] arm64: Enable the support of pseudo-NMIs Julien Thierry
2019-01-28 12:47 ` Marc Zyngier
2019-01-30 13:46 ` Julien Thierry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86wompuh5j.wl-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=catalin.marinas@arm.com \
--cc=christoffer.dall@arm.com \
--cc=daniel.thompson@linaro.org \
--cc=james.morse@arm.com \
--cc=jason@lakedaemon.net \
--cc=joel@joelfernandes.org \
--cc=julien.thierry@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).