From: Catalin Marinas <catalin.marinas@arm.com> To: Julien Thierry <julien.thierry@arm.com> Cc: linux-arm-kernel@lists.infradead.org, daniel.thompson@linaro.org, marc.zyngier@arm.com, Ard Biesheuvel <ard.biesheuvel@linaro.org>, will.deacon@arm.com, linux-kernel@vger.kernel.org, christoffer.dall@arm.com, james.morse@arm.com, Oleg Nesterov <oleg@redhat.com>, joel@joelfernandes.org Subject: Re: [PATCH v6 10/24] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Date: Tue, 4 Dec 2018 17:36:10 +0000 [thread overview] Message-ID: <20181204173610.GC19210@arrakis.emea.arm.com> (raw) In-Reply-To: <1542023835-21446-11-git-send-email-julien.thierry@arm.com> On Mon, Nov 12, 2018 at 11:57:01AM +0000, Julien Thierry wrote: > diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h > index 24692ed..e0a32e4 100644 > --- a/arch/arm64/include/asm/irqflags.h > +++ b/arch/arm64/include/asm/irqflags.h > @@ -18,7 +18,27 @@ > > #ifdef __KERNEL__ > > +#include <asm/alternative.h> > +#include <asm/cpufeature.h> > #include <asm/ptrace.h> > +#include <asm/sysreg.h> > + > + > +/* > + * When ICC_PMR_EL1 is used for interrupt masking, only the bit indicating > + * whether the normal interrupts are masked is kept along with the daif > + * flags. > + */ > +#define ARCH_FLAG_PMR_EN 0x1 > + > +#define MAKE_ARCH_FLAGS(daif, pmr) \ > + ((daif) | (((pmr) >> GIC_PRIO_STATUS_SHIFT) & ARCH_FLAG_PMR_EN)) > + > +#define ARCH_FLAGS_GET_PMR(flags) \ > + ((((flags) & ARCH_FLAG_PMR_EN) << GIC_PRIO_STATUS_SHIFT) \ > + | GIC_PRIO_IRQOFF) > + > +#define ARCH_FLAGS_GET_DAIF(flags) ((flags) & ~ARCH_FLAG_PMR_EN) I wonder whether we could just use the PSR_I_BIT here to decide whether to set the GIC_PRIO_IRQ{ON,OFF}. We could clear the PSR_I_BIT in _restore_daif() with an alternative. > +/* > + * CPU interrupt mask handling. > + */ > static inline void arch_local_irq_enable(void) > { > - asm volatile( > - "msr daifclr, #2 // arch_local_irq_enable" > - : > + unsigned long unmasked = GIC_PRIO_IRQON; > + > + asm volatile(ALTERNATIVE( > + "msr daifclr, #2 // arch_local_irq_enable\n" > + "nop", > + "msr_s " __stringify(SYS_ICC_PMR_EL1) ",%0\n" > + "dsb sy", > + ARM64_HAS_IRQ_PRIO_MASKING) DSB needed here as well? I guess I'd have to read the GIC spec before asking again ;). -- Catalin
WARNING: multiple messages have this Message-ID (diff)
From: Catalin Marinas <catalin.marinas@arm.com> To: Julien Thierry <julien.thierry@arm.com> Cc: daniel.thompson@linaro.org, Ard Biesheuvel <ard.biesheuvel@linaro.org>, marc.zyngier@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, christoffer.dall@arm.com, james.morse@arm.com, Oleg Nesterov <oleg@redhat.com>, joel@joelfernandes.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v6 10/24] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Date: Tue, 4 Dec 2018 17:36:10 +0000 [thread overview] Message-ID: <20181204173610.GC19210@arrakis.emea.arm.com> (raw) In-Reply-To: <1542023835-21446-11-git-send-email-julien.thierry@arm.com> On Mon, Nov 12, 2018 at 11:57:01AM +0000, Julien Thierry wrote: > diff --git a/arch/arm64/include/asm/irqflags.h b/arch/arm64/include/asm/irqflags.h > index 24692ed..e0a32e4 100644 > --- a/arch/arm64/include/asm/irqflags.h > +++ b/arch/arm64/include/asm/irqflags.h > @@ -18,7 +18,27 @@ > > #ifdef __KERNEL__ > > +#include <asm/alternative.h> > +#include <asm/cpufeature.h> > #include <asm/ptrace.h> > +#include <asm/sysreg.h> > + > + > +/* > + * When ICC_PMR_EL1 is used for interrupt masking, only the bit indicating > + * whether the normal interrupts are masked is kept along with the daif > + * flags. > + */ > +#define ARCH_FLAG_PMR_EN 0x1 > + > +#define MAKE_ARCH_FLAGS(daif, pmr) \ > + ((daif) | (((pmr) >> GIC_PRIO_STATUS_SHIFT) & ARCH_FLAG_PMR_EN)) > + > +#define ARCH_FLAGS_GET_PMR(flags) \ > + ((((flags) & ARCH_FLAG_PMR_EN) << GIC_PRIO_STATUS_SHIFT) \ > + | GIC_PRIO_IRQOFF) > + > +#define ARCH_FLAGS_GET_DAIF(flags) ((flags) & ~ARCH_FLAG_PMR_EN) I wonder whether we could just use the PSR_I_BIT here to decide whether to set the GIC_PRIO_IRQ{ON,OFF}. We could clear the PSR_I_BIT in _restore_daif() with an alternative. > +/* > + * CPU interrupt mask handling. > + */ > static inline void arch_local_irq_enable(void) > { > - asm volatile( > - "msr daifclr, #2 // arch_local_irq_enable" > - : > + unsigned long unmasked = GIC_PRIO_IRQON; > + > + asm volatile(ALTERNATIVE( > + "msr daifclr, #2 // arch_local_irq_enable\n" > + "nop", > + "msr_s " __stringify(SYS_ICC_PMR_EL1) ",%0\n" > + "dsb sy", > + ARM64_HAS_IRQ_PRIO_MASKING) DSB needed here as well? I guess I'd have to read the GIC spec before asking again ;). -- Catalin _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2018-12-04 17:36 UTC|newest] Thread overview: 125+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-12 11:56 [PATCH v6 00/24] arm64: provide pseudo NMI with GICv3 Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-12 11:56 ` [PATCH v6 01/24] arm64: Remove unused daif related functions/macros Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-29 16:26 ` Mark Rutland 2018-11-29 16:26 ` Mark Rutland 2018-11-30 18:03 ` Catalin Marinas 2018-11-30 18:03 ` Catalin Marinas 2018-11-12 11:56 ` [PATCH v6 02/24] arm64: cpufeature: Set SYSREG_GIC_CPUIF as a boot system feature Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-12 18:00 ` Suzuki K Poulose 2018-11-12 18:00 ` Suzuki K Poulose 2018-11-29 16:27 ` Mark Rutland 2018-11-29 16:27 ` Mark Rutland 2018-11-30 18:07 ` Catalin Marinas 2018-11-30 18:07 ` Catalin Marinas 2018-11-12 11:56 ` [PATCH v6 03/24] arm64: cpufeature: Add cpufeature for IRQ priority masking Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-12 18:02 ` Suzuki K Poulose 2018-11-12 18:02 ` Suzuki K Poulose 2018-11-29 17:12 ` Mark Rutland 2018-11-29 17:12 ` Mark Rutland 2018-12-03 10:33 ` Julien Thierry 2018-12-03 10:33 ` Julien Thierry 2018-11-30 18:07 ` Catalin Marinas 2018-11-30 18:07 ` Catalin Marinas 2018-11-12 11:56 ` [PATCH v6 04/24] arm/arm64: gic-v3: Add PMR and RPR accessors Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-29 16:32 ` Mark Rutland 2018-11-29 16:32 ` Mark Rutland 2018-11-30 18:07 ` Catalin Marinas 2018-11-30 18:07 ` Catalin Marinas 2018-11-12 11:56 ` [PATCH v6 05/24] irqchip/gic-v3: Switch to PMR masking before calling IRQ handler Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-29 18:12 ` Mark Rutland 2018-11-29 18:12 ` Mark Rutland 2018-11-30 9:18 ` Julien Thierry 2018-11-30 9:18 ` Julien Thierry 2018-12-04 16:21 ` Catalin Marinas 2018-12-04 16:21 ` Catalin Marinas 2018-11-12 11:56 ` [PATCH v6 06/24] arm64: ptrace: Provide definitions for PMR values Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-29 16:40 ` Mark Rutland 2018-11-29 16:40 ` Mark Rutland 2018-11-30 8:53 ` Julien Thierry 2018-11-30 8:53 ` Julien Thierry 2018-11-30 10:38 ` Daniel Thompson 2018-11-30 10:38 ` Daniel Thompson 2018-11-30 11:03 ` Julien Thierry 2018-11-30 11:03 ` Julien Thierry 2018-11-12 11:56 ` [PATCH v6 07/24] arm64: Make PMR part of task context Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-29 16:46 ` Mark Rutland 2018-11-29 16:46 ` Mark Rutland 2018-11-30 9:25 ` Julien Thierry 2018-11-30 9:25 ` Julien Thierry 2018-12-04 17:09 ` Catalin Marinas 2018-12-04 17:09 ` Catalin Marinas 2018-12-04 17:30 ` Julien Thierry 2018-12-04 17:30 ` Julien Thierry 2018-11-12 11:56 ` [PATCH v6 08/24] arm64: Unmask PMR before going idle Julien Thierry 2018-11-12 11:56 ` Julien Thierry 2018-11-29 17:44 ` Mark Rutland 2018-11-29 17:44 ` Mark Rutland 2018-11-30 10:55 ` Julien Thierry 2018-11-30 10:55 ` Julien Thierry 2018-11-30 13:37 ` Mark Rutland 2018-11-30 13:37 ` Mark Rutland 2018-12-03 10:38 ` Julien Thierry 2018-12-03 10:38 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 09/24] arm64: kvm: Unmask PMR before entering guest Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 10/24] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-12-04 17:36 ` Catalin Marinas [this message] 2018-12-04 17:36 ` Catalin Marinas 2018-12-05 16:55 ` Julien Thierry 2018-12-05 16:55 ` Julien Thierry 2018-12-05 18:26 ` Catalin Marinas 2018-12-05 18:26 ` Catalin Marinas 2018-12-06 9:50 ` Julien Thierry 2018-12-06 9:50 ` Julien Thierry 2018-12-10 14:39 ` Catalin Marinas 2018-12-10 14:39 ` Catalin Marinas 2018-11-12 11:57 ` [PATCH v6 11/24] arm64: daifflags: Include PMR in daifflags restore operations Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 12/24] arm64: alternative: Allow alternative status checking per cpufeature Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 13/24] arm64: alternative: Apply alternatives early in boot process Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 14/24] irqchip/gic-v3: Factor group0 detection into functions Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 15/24] arm64: Switch to PMR masking when starting CPUs Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-12-04 17:51 ` Catalin Marinas 2018-12-04 17:51 ` Catalin Marinas 2018-12-04 18:11 ` Julien Thierry 2018-12-04 18:11 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 16/24] arm64: gic-v3: Implement arch support for priority masking Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 17/24] irqchip/gic-v3: Detect if GIC can support pseudo-NMIs Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 18/24] irqchip/gic-v3: Handle pseudo-NMIs Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 19/24] irqchip/gic: Add functions to access irq priorities Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 20/24] irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 21/24] arm64: Handle serror in NMI context Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-12-04 18:09 ` Catalin Marinas 2018-12-04 18:09 ` Catalin Marinas 2018-12-05 13:02 ` James Morse 2018-12-05 13:02 ` James Morse 2018-11-12 11:57 ` [PATCH v6 22/24] arm64: Skip preemption when exiting an NMI Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 23/24] arm64: Skip irqflags tracing for NMI in IRQs disabled context Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 11:57 ` [PATCH v6 24/24] arm64: Enable the support of pseudo-NMIs Julien Thierry 2018-11-12 11:57 ` Julien Thierry 2018-11-12 12:00 ` [PATCH v6 00/24] arm64: provide pseudo NMI with GICv3 Julien Thierry 2018-11-12 12:00 ` Julien Thierry 2018-11-13 14:43 ` Julien Thierry 2018-11-13 14:43 ` 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=20181204173610.GC19210@arrakis.emea.arm.com \ --to=catalin.marinas@arm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=christoffer.dall@arm.com \ --cc=daniel.thompson@linaro.org \ --cc=james.morse@arm.com \ --cc=joel@joelfernandes.org \ --cc=julien.thierry@arm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=oleg@redhat.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.