From: Julien Thierry <julien.thierry@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, daniel.thompson@linaro.org, joel@joelfernandes.org, marc.zyngier@arm.com, mark.rutland@arm.com, christoffer.dall@arm.com, james.morse@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, Julien Thierry <julien.thierry@arm.com> Subject: [PATCH v5 05/27] arm64: Use daifflag_restore after bp_hardening Date: Tue, 28 Aug 2018 16:51:15 +0100 [thread overview] Message-ID: <1535471497-38854-6-git-send-email-julien.thierry@arm.com> (raw) In-Reply-To: <1535471497-38854-1-git-send-email-julien.thierry@arm.com> For EL0 entries requiring bp_hardening, daif status is kept at DAIF_PROCCTX_NOIRQ until after hardening has been done. Then interrupts are enabled through local_irq_enable(). Before using local_irq_* functions, daifflags should be properly restored to a state where IRQs are enabled. Enable IRQs by restoring DAIF_PROCCTX state after bp hardening. Signed-off-by: Julien Thierry <julien.thierry@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: James Morse <james.morse@arm.com> --- arch/arm64/mm/fault.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 50b30ff..dfa2c43 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -37,6 +37,7 @@ #include <asm/cmpxchg.h> #include <asm/cpufeature.h> #include <asm/exception.h> +#include <asm/daifflags.h> #include <asm/debug-monitors.h> #include <asm/esr.h> #include <asm/sysreg.h> @@ -771,7 +772,7 @@ asmlinkage void __exception do_el0_ia_bp_hardening(unsigned long addr, if (addr > TASK_SIZE) arm64_apply_bp_hardening(); - local_irq_enable(); + local_daif_restore(DAIF_PROCCTX); do_mem_abort(addr, esr, regs); } @@ -785,7 +786,7 @@ asmlinkage void __exception do_sp_pc_abort(unsigned long addr, if (user_mode(regs)) { if (instruction_pointer(regs) > TASK_SIZE) arm64_apply_bp_hardening(); - local_irq_enable(); + local_daif_restore(DAIF_PROCCTX); } clear_siginfo(&info); -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: julien.thierry@arm.com (Julien Thierry) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 05/27] arm64: Use daifflag_restore after bp_hardening Date: Tue, 28 Aug 2018 16:51:15 +0100 [thread overview] Message-ID: <1535471497-38854-6-git-send-email-julien.thierry@arm.com> (raw) In-Reply-To: <1535471497-38854-1-git-send-email-julien.thierry@arm.com> For EL0 entries requiring bp_hardening, daif status is kept at DAIF_PROCCTX_NOIRQ until after hardening has been done. Then interrupts are enabled through local_irq_enable(). Before using local_irq_* functions, daifflags should be properly restored to a state where IRQs are enabled. Enable IRQs by restoring DAIF_PROCCTX state after bp hardening. Signed-off-by: Julien Thierry <julien.thierry@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: James Morse <james.morse@arm.com> --- arch/arm64/mm/fault.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 50b30ff..dfa2c43 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -37,6 +37,7 @@ #include <asm/cmpxchg.h> #include <asm/cpufeature.h> #include <asm/exception.h> +#include <asm/daifflags.h> #include <asm/debug-monitors.h> #include <asm/esr.h> #include <asm/sysreg.h> @@ -771,7 +772,7 @@ asmlinkage void __exception do_el0_ia_bp_hardening(unsigned long addr, if (addr > TASK_SIZE) arm64_apply_bp_hardening(); - local_irq_enable(); + local_daif_restore(DAIF_PROCCTX); do_mem_abort(addr, esr, regs); } @@ -785,7 +786,7 @@ asmlinkage void __exception do_sp_pc_abort(unsigned long addr, if (user_mode(regs)) { if (instruction_pointer(regs) > TASK_SIZE) arm64_apply_bp_hardening(); - local_irq_enable(); + local_daif_restore(DAIF_PROCCTX); } clear_siginfo(&info); -- 1.9.1
next prev parent reply other threads:[~2018-08-28 15:52 UTC|newest] Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-28 15:51 [PATCH v5 00/27] arm64: provide pseudo NMI with GICv3 Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 01/27] arm64: cpufeature: Set SYSREG_GIC_CPUIF as a boot system feature Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-09-21 15:56 ` Marc Zyngier 2018-09-21 15:56 ` Marc Zyngier 2018-09-25 3:10 ` Yao Lihua 2018-09-25 8:13 ` Marc Zyngier 2018-09-25 8:13 ` Marc Zyngier 2018-09-25 10:39 ` Yao Lihua 2018-08-28 15:51 ` [PATCH v5 02/27] arm64: cpufeature: Use alternatives for VHE cpu_enable Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-09-12 10:28 ` James Morse 2018-09-12 10:28 ` James Morse 2018-09-12 12:03 ` Julien Thierry 2018-09-12 12:03 ` Julien Thierry 2018-09-18 17:46 ` James Morse 2018-09-18 17:46 ` James Morse 2018-09-12 12:37 ` Suzuki K Poulose 2018-09-12 12:37 ` Suzuki K Poulose 2018-08-28 15:51 ` [PATCH v5 03/27] arm64: alternative: Apply alternatives early in boot process Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-09-12 10:29 ` James Morse 2018-09-12 10:29 ` James Morse 2018-09-12 16:49 ` Julien Thierry 2018-09-12 16:49 ` Julien Thierry 2018-09-17 23:44 ` Daniel Thompson 2018-09-17 23:44 ` Daniel Thompson 2018-09-18 7:37 ` Julien Thierry 2018-09-18 7:37 ` Julien Thierry 2018-09-18 17:47 ` James Morse 2018-09-18 17:47 ` James Morse 2018-09-21 16:05 ` Marc Zyngier 2018-09-21 16:05 ` Marc Zyngier 2018-08-28 15:51 ` [PATCH v5 04/27] arm64: daifflags: Use irqflags functions for daifflags Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-09-12 12:28 ` James Morse 2018-09-12 12:28 ` James Morse 2018-10-03 15:09 ` Catalin Marinas 2018-10-03 15:09 ` Catalin Marinas 2018-08-28 15:51 ` Julien Thierry [this message] 2018-08-28 15:51 ` [PATCH v5 05/27] arm64: Use daifflag_restore after bp_hardening Julien Thierry 2018-09-12 10:32 ` James Morse 2018-09-12 10:32 ` James Morse 2018-09-12 11:11 ` Julien Thierry 2018-09-12 11:11 ` Julien Thierry 2018-09-12 12:28 ` James Morse 2018-09-12 12:28 ` James Morse 2018-09-12 13:03 ` Julien Thierry 2018-09-12 13:03 ` Julien Thierry 2018-10-03 15:12 ` Catalin Marinas 2018-10-03 15:12 ` Catalin Marinas 2018-08-28 15:51 ` [PATCH v5 06/27] arm64: Delay daif masking for user return Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-09-12 10:31 ` James Morse 2018-09-12 10:31 ` James Morse 2018-09-12 13:07 ` Julien Thierry 2018-09-12 13:07 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 07/27] arm64: xen: Use existing helper to check interrupt status Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-29 21:35 ` Stefano Stabellini 2018-08-29 21:35 ` Stefano Stabellini 2018-10-03 15:14 ` Catalin Marinas 2018-10-03 15:14 ` Catalin Marinas 2018-08-28 15:51 ` [PATCH v5 08/27] irqchip/gic: Unify GIC priority definitions Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-10-03 9:24 ` Marc Zyngier 2018-10-03 9:24 ` Marc Zyngier 2018-08-28 15:51 ` [PATCH v5 09/27] irqchip/gic: Lower priority of GIC interrupts Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 10/27] arm64: cpufeature: Add cpufeature for IRQ priority masking Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 11/27] arm64: Make PMR part of task context Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 12/27] arm64: Unmask PMR before going idle Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 13/27] arm/arm64: gic-v3: Add helper functions to manage IRQ priorities Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 14/27] arm64: kvm: Unmask PMR before entering guest Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 15/27] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-09-21 17:39 ` Julien Thierry 2018-09-21 17:39 ` Julien Thierry 2018-09-21 17:55 ` Julien Thierry 2018-09-21 17:55 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 16/27] arm64: daifflags: Include PMR in daifflags restore operations Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 17/27] irqchip/gic-v3: Factor group0 detection into functions Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 18/27] irqchip/gic-v3: Do not overwrite PMR value Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 19/27] irqchip/gic-v3: Remove acknowledge loop Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-10-03 9:26 ` Marc Zyngier 2018-10-03 9:26 ` Marc Zyngier 2018-08-28 15:51 ` [PATCH v5 20/27] irqchip/gic-v3: Switch to PMR masking after IRQ acknowledge Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 21/27] arm64: Switch to PMR masking when starting CPUs Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 22/27] arm64: Add build option for IRQ masking via priority Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 23/27] arm64: Handle serror in NMI context Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 24/27] irqchip/gic-v3: Detect current view of GIC priorities Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 25/27] irqchip/gic-v3: Add base support for pseudo-NMI Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 26/27] irqchip/gic: Add functions to access irq priorities Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-28 15:51 ` [PATCH v5 27/27] irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI Julien Thierry 2018-08-28 15:51 ` Julien Thierry 2018-08-29 11:37 ` [PATCH v5 00/27] arm64: provide pseudo NMI with GICv3 Daniel Thompson 2018-08-29 11:37 ` Daniel Thompson 2018-08-29 12:58 ` Julien Thierry 2018-08-29 12:58 ` 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=1535471497-38854-6-git-send-email-julien.thierry@arm.com \ --to=julien.thierry@arm.com \ --cc=catalin.marinas@arm.com \ --cc=christoffer.dall@arm.com \ --cc=daniel.thompson@linaro.org \ --cc=james.morse@arm.com \ --cc=joel@joelfernandes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=marc.zyngier@arm.com \ --cc=mark.rutland@arm.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.