From: Julien Thierry <julien.thierry@arm.com> To: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: linux-arm-kernel <linux-arm-kernel@lists.infradead.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Daniel Thompson <daniel.thompson@linaro.org>, joel@joelfernandes.org, Marc Zyngier <marc.zyngier@arm.com>, Christoffer Dall <christoffer.dall@arm.com>, James Morse <james.morse@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Mark Rutland <mark.rutland@arm.com>, oleg@redhat.com Subject: Re: [PATCH v7 11/25] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Date: Fri, 14 Dec 2018 15:23:21 +0000 [thread overview] Message-ID: <7d42f570-541a-59a3-79fc-f00dc0b51689@arm.com> (raw) In-Reply-To: <e0ecdb24-ef52-2c31-565d-66f7a2770f4a@arm.com> Hi, On 13/12/2018 15:03, Julien Thierry wrote: > > Argh, not as simple as I had expected. > > Turns out include/linux/efi.h does not include asm/efi.h (including it > at the beginning of the file breaks the build because asm/efi.h misses > the efi type definitions. > > So a thing like: > > #ifndef efi_get_irqflags > #define efi_get_irqflags(flags) local_save_flags(flags) > #endif > > in include/linux/efi.h cannot be overridden. > > Either I would need to introduce the definitions arm, arm64 and x86 (I > don't think there are other arch supporting EFI right now) or I'll need > to come up with another solution. > Would the following patch be acceptable for the EFI generic side? If it is, I'll add it to the next iteration of this series. Thanks, Julien --> From 7acaa8e17142263addafb18ae10bd5d2d49cfb39 Mon Sep 17 00:00:00 2001 From: Julien Thierry <julien.thierry@arm.com> Date: Fri, 14 Dec 2018 14:20:13 +0000 Subject: [RFC] efi: Let architectures decide the flags that should be saved/restored Currently, irqflags are saved before calling runtime services and checked for mismatch on return. Add a config option to let architectures define a set of flags to be checked and (if needed) restored when coming back from runtime services. This allows to use check flags that are not necesarly related to irqflags. Signed-off-by: Julien Thierry <julien.thierry@arm.com> --- arch/Kconfig | 8 ++++++++ drivers/firmware/efi/runtime-wrappers.c | 4 ++-- include/linux/efi.h | 12 ++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index e1e540f..cbec325 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -695,6 +695,14 @@ config HAVE_ARCH_HASH file which provides platform-specific implementations of some functions in <linux/hash.h> or fs/namei.c. +config HAVE_GENERIC_EFI_FLAGS + bool + default n + help + Architecture defines a set of flags that EFI runtime services + should take care to restore when returning to the OS. + If this is not set, the set of flags defaults to the arch irqflags. + config ISA_BUS_API def_bool ISA diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index 8903b9c..6dafa04 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -93,7 +93,7 @@ void efi_call_virt_check_flags(unsigned long flags, const char *call) { unsigned long cur_flags, mismatch; - local_save_flags(cur_flags); + efi_save_flags(cur_flags); mismatch = flags ^ cur_flags; if (!WARN_ON_ONCE(mismatch & ARCH_EFI_IRQ_FLAGS_MASK)) @@ -102,7 +102,7 @@ void efi_call_virt_check_flags(unsigned long flags, const char *call) add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_NOW_UNRELIABLE); pr_err_ratelimited(FW_BUG "IRQ flags corrupted (0x%08lx=>0x%08lx) by EFI %s\n", flags, cur_flags, call); - local_irq_restore(flags); + efi_restore_flags(flags); } /* diff --git a/include/linux/efi.h b/include/linux/efi.h index 100ce4a..41c110a 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1594,6 +1594,14 @@ enum efi_secureboot_mode { void efi_retrieve_tpm2_eventlog(efi_system_table_t *sys_table); +#ifdef CONFIG_HAVE_GENERIC_EFI_FLAGS +#define efi_save_flags(state_flags) arch_efi_save_flags(state_flags) +#define efi_restore_flags(state_flags) arch_efi_restore_flags(state_flags) +#else +#define efi_save_flags(state_flags) local_save_flags(state_flags) +#define efi_restore_flags(state_flags) local_irq_restore(state_flags) +#endif + /* * Arch code can implement the following three template macros, avoiding * reptition for the void/non-void return cases of {__,}efi_call_virt(): @@ -1621,7 +1629,7 @@ enum efi_secureboot_mode { \ arch_efi_call_virt_setup(); \ \ - local_save_flags(__flags); \ + efi_save_flags(__flags); \ __s = arch_efi_call_virt(p, f, args); \ efi_call_virt_check_flags(__flags, __stringify(f)); \ \ @@ -1636,7 +1644,7 @@ enum efi_secureboot_mode { \ arch_efi_call_virt_setup(); \ \ - local_save_flags(__flags); \ + efi_save_flags(__flags); \ arch_efi_call_virt(p, f, args); \ efi_call_virt_check_flags(__flags, __stringify(f)); \ \ -- 1.9.1 -- Julien Thierry
WARNING: multiple messages have this Message-ID (diff)
From: Julien Thierry <julien.thierry@arm.com> To: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com>, Daniel Thompson <daniel.thompson@linaro.org>, Marc Zyngier <marc.zyngier@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Christoffer Dall <christoffer.dall@arm.com>, James Morse <james.morse@arm.com>, oleg@redhat.com, joel@joelfernandes.org, linux-arm-kernel <linux-arm-kernel@lists.infradead.org> Subject: Re: [PATCH v7 11/25] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Date: Fri, 14 Dec 2018 15:23:21 +0000 [thread overview] Message-ID: <7d42f570-541a-59a3-79fc-f00dc0b51689@arm.com> (raw) In-Reply-To: <e0ecdb24-ef52-2c31-565d-66f7a2770f4a@arm.com> Hi, On 13/12/2018 15:03, Julien Thierry wrote: > > Argh, not as simple as I had expected. > > Turns out include/linux/efi.h does not include asm/efi.h (including it > at the beginning of the file breaks the build because asm/efi.h misses > the efi type definitions. > > So a thing like: > > #ifndef efi_get_irqflags > #define efi_get_irqflags(flags) local_save_flags(flags) > #endif > > in include/linux/efi.h cannot be overridden. > > Either I would need to introduce the definitions arm, arm64 and x86 (I > don't think there are other arch supporting EFI right now) or I'll need > to come up with another solution. > Would the following patch be acceptable for the EFI generic side? If it is, I'll add it to the next iteration of this series. Thanks, Julien --> From 7acaa8e17142263addafb18ae10bd5d2d49cfb39 Mon Sep 17 00:00:00 2001 From: Julien Thierry <julien.thierry@arm.com> Date: Fri, 14 Dec 2018 14:20:13 +0000 Subject: [RFC] efi: Let architectures decide the flags that should be saved/restored Currently, irqflags are saved before calling runtime services and checked for mismatch on return. Add a config option to let architectures define a set of flags to be checked and (if needed) restored when coming back from runtime services. This allows to use check flags that are not necesarly related to irqflags. Signed-off-by: Julien Thierry <julien.thierry@arm.com> --- arch/Kconfig | 8 ++++++++ drivers/firmware/efi/runtime-wrappers.c | 4 ++-- include/linux/efi.h | 12 ++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index e1e540f..cbec325 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -695,6 +695,14 @@ config HAVE_ARCH_HASH file which provides platform-specific implementations of some functions in <linux/hash.h> or fs/namei.c. +config HAVE_GENERIC_EFI_FLAGS + bool + default n + help + Architecture defines a set of flags that EFI runtime services + should take care to restore when returning to the OS. + If this is not set, the set of flags defaults to the arch irqflags. + config ISA_BUS_API def_bool ISA diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index 8903b9c..6dafa04 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -93,7 +93,7 @@ void efi_call_virt_check_flags(unsigned long flags, const char *call) { unsigned long cur_flags, mismatch; - local_save_flags(cur_flags); + efi_save_flags(cur_flags); mismatch = flags ^ cur_flags; if (!WARN_ON_ONCE(mismatch & ARCH_EFI_IRQ_FLAGS_MASK)) @@ -102,7 +102,7 @@ void efi_call_virt_check_flags(unsigned long flags, const char *call) add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_NOW_UNRELIABLE); pr_err_ratelimited(FW_BUG "IRQ flags corrupted (0x%08lx=>0x%08lx) by EFI %s\n", flags, cur_flags, call); - local_irq_restore(flags); + efi_restore_flags(flags); } /* diff --git a/include/linux/efi.h b/include/linux/efi.h index 100ce4a..41c110a 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1594,6 +1594,14 @@ enum efi_secureboot_mode { void efi_retrieve_tpm2_eventlog(efi_system_table_t *sys_table); +#ifdef CONFIG_HAVE_GENERIC_EFI_FLAGS +#define efi_save_flags(state_flags) arch_efi_save_flags(state_flags) +#define efi_restore_flags(state_flags) arch_efi_restore_flags(state_flags) +#else +#define efi_save_flags(state_flags) local_save_flags(state_flags) +#define efi_restore_flags(state_flags) local_irq_restore(state_flags) +#endif + /* * Arch code can implement the following three template macros, avoiding * reptition for the void/non-void return cases of {__,}efi_call_virt(): @@ -1621,7 +1629,7 @@ enum efi_secureboot_mode { \ arch_efi_call_virt_setup(); \ \ - local_save_flags(__flags); \ + efi_save_flags(__flags); \ __s = arch_efi_call_virt(p, f, args); \ efi_call_virt_check_flags(__flags, __stringify(f)); \ \ @@ -1636,7 +1644,7 @@ enum efi_secureboot_mode { \ arch_efi_call_virt_setup(); \ \ - local_save_flags(__flags); \ + efi_save_flags(__flags); \ arch_efi_call_virt(p, f, args); \ efi_call_virt_check_flags(__flags, __stringify(f)); \ \ -- 1.9.1 -- Julien Thierry _______________________________________________ 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-14 15:23 UTC|newest] Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-12 16:47 [PATCH v7 00/25] arm64: provide pseudo NMI with GICv3 Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 01/25] arm64: Fix HCR.TGE status for NMI contexts Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 21:39 ` Sasha Levin 2018-12-12 21:39 ` Sasha Levin 2018-12-17 8:49 ` Julien Thierry 2018-12-17 8:49 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 02/25] arm64: Remove unused daif related functions/macros Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 03/25] arm64: cpufeature: Set SYSREG_GIC_CPUIF as a boot system feature Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 04/25] arm64: cpufeature: Add cpufeature for IRQ priority masking Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 05/25] arm/arm64: gic-v3: Add PMR and RPR accessors Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 06/25] irqchip/gic-v3: Switch to PMR masking before calling IRQ handler Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 07/25] arm64: ptrace: Provide definitions for PMR values Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 08/25] arm64: Make PMR part of task context Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 09/25] arm64: Unmask PMR before going idle Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 10/25] arm64: kvm: Unmask PMR before entering guest Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 11/25] arm64: irqflags: Use ICC_PMR_EL1 for interrupt masking Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 17:27 ` Ard Biesheuvel 2018-12-12 17:27 ` Ard Biesheuvel 2018-12-12 17:59 ` Julien Thierry 2018-12-12 17:59 ` Julien Thierry 2018-12-12 18:10 ` Ard Biesheuvel 2018-12-12 18:10 ` Ard Biesheuvel 2018-12-13 8:54 ` Julien Thierry 2018-12-13 8:54 ` Julien Thierry 2018-12-13 11:35 ` Ard Biesheuvel 2018-12-13 11:35 ` Ard Biesheuvel 2018-12-13 12:02 ` Julien Thierry 2018-12-13 12:02 ` Julien Thierry 2018-12-13 15:03 ` Julien Thierry 2018-12-13 15:03 ` Julien Thierry 2018-12-14 15:23 ` Julien Thierry [this message] 2018-12-14 15:23 ` Julien Thierry 2018-12-14 15:49 ` Ard Biesheuvel 2018-12-14 15:49 ` Ard Biesheuvel 2018-12-14 16:40 ` Julien Thierry 2018-12-14 16:40 ` Julien Thierry 2018-12-19 17:01 ` Julien Thierry 2018-12-19 17:01 ` Julien Thierry 2018-12-20 17:53 ` Ard Biesheuvel 2018-12-20 17:53 ` Ard Biesheuvel 2018-12-21 10:25 ` Julien Thierry 2018-12-21 10:25 ` Julien Thierry 2018-12-16 14:47 ` Jian-Lin Chen 2018-12-16 14:47 ` Jian-Lin Chen 2018-12-17 9:26 ` Julien Thierry 2018-12-17 9:26 ` Julien Thierry 2018-12-18 8:36 ` Jian-Lin Chen 2018-12-18 8:36 ` Jian-Lin Chen 2018-12-12 16:47 ` [PATCH v7 12/25] arm64: daifflags: Include PMR in daifflags restore operations Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 13/25] arm64: alternative: Allow alternative status checking per cpufeature Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 14/25] arm64: alternative: Apply alternatives early in boot process Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 15/25] irqchip/gic-v3: Factor group0 detection into functions Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 16/25] arm64: Switch to PMR masking when starting CPUs Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 17/25] arm64: gic-v3: Implement arch support for priority masking Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 18/25] irqchip/gic-v3: Detect if GIC can support pseudo-NMIs Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 19/25] irqchip/gic-v3: Handle pseudo-NMIs Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 20/25] irqchip/gic: Add functions to access irq priorities Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 21/25] irqchip/gic-v3: Allow interrupts to be set as pseudo-NMI Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 22/25] arm64: Handle serror in NMI context Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 23/25] arm64: Skip preemption when exiting an NMI Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 24/25] arm64: Skip irqflags tracing for NMI in IRQs disabled context Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:47 ` [PATCH v7 25/25] arm64: Enable the support of pseudo-NMIs Julien Thierry 2018-12-12 16:47 ` Julien Thierry 2018-12-12 16:52 ` [PATCH v7 00/25] arm64: provide pseudo NMI with GICv3 Julien Thierry 2018-12-12 16:52 ` 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=7d42f570-541a-59a3-79fc-f00dc0b51689@arm.com \ --to=julien.thierry@arm.com \ --cc=ard.biesheuvel@linaro.org \ --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=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.