From: Matt Fleming <matt@codeblueprint.co.uk> To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, "H . Peter Anvin" <hpa@zytor.com> Cc: Mark Rutland <mark.rutland@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming <matt@codeblueprint.co.uk>, Catalin Marinas <catalin.marinas@arm.com>, Leif Lindholm <leif.lindholm@linaro.org>, Russell King <linux@arm.linux.org.uk>, Will Deacon <will.deacon@arm.com> Subject: [PATCH 31/40] efi/runtime-wrappers: Add {__,}efi_call_virt templates Date: Mon, 25 Apr 2016 21:07:03 +0100 [thread overview] Message-ID: <1461614832-17633-32-git-send-email-matt@codeblueprint.co.uk> (raw) In-Reply-To: <1461614832-17633-1-git-send-email-matt@codeblueprint.co.uk> From: Mark Rutland <mark.rutland@arm.com> Currently each architecture must implement two macros, efi_call_virt and __efi_call_virt, which only differ by the presence or absence of a return type. Otherwise, the logic surrounding the call is identical. As each architecture must define the entire body of each, we can't place any generic manipulation (e.g. irq flag validation) in the middle. This patch adds template implementations of these macros. With these, arch code can implement three template macros, avoiding reptition for the void/non-void return cases: * arch_efi_call_virt_setup Sets up the environment for the call (e.g. switching page tables, allowing kernel-mode use of floating point, if required). * arch_efi_call_virt Performs the call. The last expression in the macro must be the call itself, allowing the logic to be shared by the void and non-void cases. * arch_efi_call_virt_teardown Restores the usual kernel environment once the call has returned. While the savings from repition are minimal, we additionally gain the ability to add common code around the call with the call environment set up. This can be used to detect common firmware issues (e.g. bad irq mask management). Signed-off-by: Mark Rutland <mark.rutland@arm.com> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Leif Lindholm <leif.lindholm@linaro.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk> --- drivers/firmware/efi/runtime-wrappers.c | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index de6953039af6..0677577bdaa1 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -21,6 +21,46 @@ #include <asm/efi.h> /* + * Arch code can implement the following three template macros, avoiding + * reptition for the void/non-void return cases of {__,}efi_call_virt: + * + * * arch_efi_call_virt_setup + * + * Sets up the environment for the call (e.g. switching page tables, + * allowing kernel-mode use of floating point, if required). + * + * * arch_efi_call_virt + * + * Performs the call. The last expression in the macro must be the call + * itself, allowing the logic to be shared by the void and non-void + * cases. + * + * * arch_efi_call_virt_teardown + * + * Restores the usual kernel environment once the call has returned. + */ + +#ifndef efi_call_virt +#define efi_call_virt(f, args...) \ +({ \ + efi_status_t __s; \ + arch_efi_call_virt_setup(); \ + __s = arch_efi_call_virt(f, args); \ + arch_efi_call_virt_teardown(); \ + __s; \ +}) +#endif + +#ifndef __efi_call_virt +#define __efi_call_virt(f, args...) \ +({ \ + arch_efi_call_virt_setup(); \ + arch_efi_call_virt(f, args); \ + arch_efi_call_virt_teardown(); \ +}) +#endif + +/* * According to section 7.1 of the UEFI spec, Runtime Services are not fully * reentrant, and there are particular combinations of calls that need to be * serialized. (source: UEFI Specification v2.4A) -- 2.7.3
WARNING: multiple messages have this Message-ID (diff)
From: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org> To: Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, "H . Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org> Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>, Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>, Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>, Leif Lindholm <leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>, Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> Subject: [PATCH 31/40] efi/runtime-wrappers: Add {__,}efi_call_virt templates Date: Mon, 25 Apr 2016 21:07:03 +0100 [thread overview] Message-ID: <1461614832-17633-32-git-send-email-matt@codeblueprint.co.uk> (raw) In-Reply-To: <1461614832-17633-1-git-send-email-matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org> From: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> Currently each architecture must implement two macros, efi_call_virt and __efi_call_virt, which only differ by the presence or absence of a return type. Otherwise, the logic surrounding the call is identical. As each architecture must define the entire body of each, we can't place any generic manipulation (e.g. irq flag validation) in the middle. This patch adds template implementations of these macros. With these, arch code can implement three template macros, avoiding reptition for the void/non-void return cases: * arch_efi_call_virt_setup Sets up the environment for the call (e.g. switching page tables, allowing kernel-mode use of floating point, if required). * arch_efi_call_virt Performs the call. The last expression in the macro must be the call itself, allowing the logic to be shared by the void and non-void cases. * arch_efi_call_virt_teardown Restores the usual kernel environment once the call has returned. While the savings from repition are minimal, we additionally gain the ability to add common code around the call with the call environment set up. This can be used to detect common firmware issues (e.g. bad irq mask management). Signed-off-by: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> Reviewed-by: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Cc: linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org> Cc: "H. Peter Anvin" <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org> Cc: Leif Lindholm <leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Cc: Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> Cc: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org> Cc: Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> Signed-off-by: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org> --- drivers/firmware/efi/runtime-wrappers.c | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index de6953039af6..0677577bdaa1 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c @@ -21,6 +21,46 @@ #include <asm/efi.h> /* + * Arch code can implement the following three template macros, avoiding + * reptition for the void/non-void return cases of {__,}efi_call_virt: + * + * * arch_efi_call_virt_setup + * + * Sets up the environment for the call (e.g. switching page tables, + * allowing kernel-mode use of floating point, if required). + * + * * arch_efi_call_virt + * + * Performs the call. The last expression in the macro must be the call + * itself, allowing the logic to be shared by the void and non-void + * cases. + * + * * arch_efi_call_virt_teardown + * + * Restores the usual kernel environment once the call has returned. + */ + +#ifndef efi_call_virt +#define efi_call_virt(f, args...) \ +({ \ + efi_status_t __s; \ + arch_efi_call_virt_setup(); \ + __s = arch_efi_call_virt(f, args); \ + arch_efi_call_virt_teardown(); \ + __s; \ +}) +#endif + +#ifndef __efi_call_virt +#define __efi_call_virt(f, args...) \ +({ \ + arch_efi_call_virt_setup(); \ + arch_efi_call_virt(f, args); \ + arch_efi_call_virt_teardown(); \ +}) +#endif + +/* * According to section 7.1 of the UEFI spec, Runtime Services are not fully * reentrant, and there are particular combinations of calls that need to be * serialized. (source: UEFI Specification v2.4A) -- 2.7.3
next prev parent reply other threads:[~2016-04-25 20:11 UTC|newest] Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-04-25 20:06 [GIT PULL 00/40] EFI changes for v4.7 Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-25 20:06 ` [PATCH 01/40] efi: Get rid of EFI_SYSTEM_TABLES status bit Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-28 10:30 ` [tip:efi/core] efi: Get rid of the " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 02/40] efi/arm*: Drop writable mapping of the UEFI System table Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-28 10:30 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 03/40] x86/mm/pat: Document the (currently) EFI-only code path Matt Fleming 2016-04-28 10:31 ` [tip:efi/core] " tip-bot for Matt Fleming 2016-04-25 20:06 ` [PATCH 04/40] efi/arm64: Report unexpected errors when determining Secure Boot status Matt Fleming 2016-04-28 10:31 ` [tip:efi/core] " tip-bot for Linn Crosetto 2016-04-25 20:06 ` [PATCH 05/40] efi/arm64: Check SetupMode " Matt Fleming 2016-04-28 10:31 ` [tip:efi/core] " tip-bot for Linn Crosetto 2016-04-25 20:06 ` [PATCH 06/40] efi: Iterate over efi.memmap in for_each_efi_memory_desc Matt Fleming 2016-04-28 10:32 ` [tip:efi/core] efi: Iterate over efi.memmap in for_each_efi_memory_desc() tip-bot for Matt Fleming 2016-04-25 20:06 ` [PATCH 07/40] efi: Remove global 'memmap' Matt Fleming 2016-04-28 10:32 ` [tip:efi/core] efi: Remove global 'memmap' EFI memory map tip-bot for Matt Fleming 2016-04-29 8:31 ` [PATCH] efi: Remove unnecessary (and buggy) .memmap initialization from the Xen EFI driver Ingo Molnar 2016-04-29 8:39 ` Matt Fleming 2016-04-29 9:53 ` [tip:efi/core] " tip-bot for Ingo Molnar 2016-04-25 20:06 ` [PATCH 08/40] efi: Check EFI_MEMORY_DESCRIPTOR version explicitly Matt Fleming 2016-04-28 10:33 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 09/40] efi/arm*: Use memremap() to create the persistent memmap mapping Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-28 10:33 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 10/40] ARM: efi: Apply strict permissons for UEFI Runtime Services regions Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-28 10:33 ` [tip:efi/core] ARM/efi: Apply strict permissions " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 11/40] arm64: efi: Apply strict permissons " Matt Fleming 2016-04-28 10:34 ` [tip:efi/core] arm64/efi: Apply strict permissions to " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 12/40] efi: Add support for the EFI_MEMORY_ATTRIBUTES_TABLE config table Matt Fleming 2016-04-28 10:34 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 13/40] efi: Implement generic support for the Memory Attributes table Matt Fleming 2016-04-28 10:35 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 14/40] efi/arm*: Take the Memory Attributes table into account Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-28 10:35 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 15/40] x86/efi: Remove the always true EFI_DEBUG symbol Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-28 10:36 ` [tip:efi/core] " tip-bot for Matt Fleming 2016-04-25 20:06 ` [PATCH 16/40] x86/efi: Prepare GOP handling code for reuse as generic code Matt Fleming 2016-04-28 10:36 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 17/40] efi/libstub: Move Graphics Output Protocol handling to " Matt Fleming 2016-04-28 10:36 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 18/40] x86/efi: efifb: Move DMI based quirks handling out of " Matt Fleming 2016-04-28 10:37 ` [tip:efi/core] x86/efi/efifb: " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 19/40] efifb: Use builtin_platform_driver and drop unused includes Matt Fleming 2016-04-28 10:37 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 20/40] arm64/efi: libstub: Make screen_info accessible to the UEFI stub Matt Fleming 2016-04-28 10:38 ` [tip:efi/core] arm64/efi/libstub: " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 21/40] efi/arm: libstub: " Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-28 10:38 ` [tip:efi/core] efi/arm/libstub: " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 22/40] efi/arm*: libstub: Wire up GOP protocol to struct screen_info Matt Fleming 2016-04-28 10:38 ` [tip:efi/core] efi/arm*/libstub: Wire up GOP protocol to 'struct screen_info' tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 23/40] efi/arm*: Wire up struct screen_info to efi-framebuffer platform device Matt Fleming 2016-04-28 10:39 ` [tip:efi/core] efi/arm*: Wire up 'struct screen_info' " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 24/40] efifb: Enable the efi-framebuffer platform driver for ARM and arm64 Matt Fleming 2016-04-28 10:39 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:06 ` [PATCH 25/40] efibc: EFI Bootloader Control Matt Fleming 2016-04-25 20:06 ` Matt Fleming 2016-04-28 10:40 ` [tip:efi/core] efibc: Add EFI Bootloader Control module tip-bot for Compostella, Jeremy 2016-04-29 9:53 ` Ingo Molnar 2016-04-29 10:30 ` Matt Fleming 2016-04-29 11:36 ` Compostella, Jeremy 2016-04-29 12:16 ` Matt Fleming 2016-04-29 13:53 ` Compostella, Jeremy 2016-04-29 19:46 ` Ingo Molnar 2016-04-30 8:33 ` Compostella, Jeremy 2016-04-30 20:01 ` Matt Fleming 2016-04-30 20:08 ` Matt Fleming 2016-05-02 7:56 ` Compostella, Jeremy 2016-05-03 14:41 ` Matt Fleming 2016-05-01 8:03 ` Ard Biesheuvel 2016-05-01 13:13 ` Matt Fleming 2016-04-25 20:06 ` [PATCH 26/40] efi: Move efi_status_to_err() to drivers/firmware/efi/ Matt Fleming 2016-04-28 10:40 ` [tip:efi/core] " tip-bot for Matt Fleming 2016-04-25 20:06 ` [PATCH 27/40] efi: Capsule update support Matt Fleming 2016-04-28 10:40 ` [tip:efi/core] efi: Add 'capsule' " tip-bot for Matt Fleming 2016-04-25 20:07 ` [PATCH 28/40] x86/efi: Force EFI reboot to process pending capsules Matt Fleming 2016-04-28 10:41 ` [tip:efi/core] " tip-bot for Matt Fleming 2016-04-25 20:07 ` [PATCH 29/40] efi: A misc char interface to update EFI firmware Matt Fleming 2016-04-28 10:41 ` [tip:efi/core] efi: Add misc char driver " tip-bot for Kweh, Hock Leong 2016-04-25 20:07 ` [PATCH 30/40] efi/arm-init: Reserve rather than unmap the memory map for ARM as well Matt Fleming 2016-04-28 10:42 ` [tip:efi/core] " tip-bot for Ard Biesheuvel 2016-04-25 20:07 ` Matt Fleming [this message] 2016-04-25 20:07 ` [PATCH 31/40] efi/runtime-wrappers: Add {__,}efi_call_virt templates Matt Fleming 2016-04-28 10:42 ` [tip:efi/core] efi/runtime-wrappers: Add {__,}efi_call_virt() templates tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 32/40] arm64/efi: Move to generic {__,}efi_call_virt Matt Fleming 2016-04-25 20:07 ` Matt Fleming 2016-04-28 10:42 ` [tip:efi/core] arm64/efi: Move to generic {__,}efi_call_virt() tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 33/40] arm/efi: Move to generic {__,}efi_call_virt Matt Fleming 2016-04-28 10:43 ` [tip:efi/core] arm/efi: Move to generic {__,}efi_call_virt() tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 34/40] x86/efi: Move to generic {__,}efi_call_virt Matt Fleming 2016-04-25 20:07 ` Matt Fleming 2016-04-28 10:43 ` [tip:efi/core] x86/efi: Move to generic {__,}efi_call_virt() tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 35/40] efi/runtime-wrappers: Remove redundant ifdefs Matt Fleming 2016-04-25 20:07 ` Matt Fleming 2016-04-28 10:44 ` [tip:efi/core] efi/runtime-wrappers: Remove redundant #ifdefs tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 36/40] efi/runtime-wrappers: Detect firmware irq flag corruption Matt Fleming 2016-04-28 10:44 ` [tip:efi/core] efi/runtime-wrappers: Detect firmware IRQ " tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 37/40] arm64/efi: Enable runtime call flag checking Matt Fleming 2016-04-28 10:44 ` [tip:efi/core] " tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 38/40] arm/efi: " Matt Fleming 2016-04-28 10:45 ` [tip:efi/core] " tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 39/40] x86/efi: " Matt Fleming 2016-04-28 10:45 ` [tip:efi/core] " tip-bot for Mark Rutland 2016-04-25 20:07 ` [PATCH 40/40] efi/runtime-wrappers: Remove ARCH_EFI_IRQ_FLAGS_MASK ifdef Matt Fleming 2016-04-28 10:46 ` [tip:efi/core] efi/runtime-wrappers: Remove ARCH_EFI_IRQ_FLAGS_MASK #ifdef tip-bot for Mark Rutland
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=1461614832-17633-32-git-send-email-matt@codeblueprint.co.uk \ --to=matt@codeblueprint.co.uk \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=hpa@zytor.com \ --cc=leif.lindholm@linaro.org \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=mark.rutland@arm.com \ --cc=mingo@kernel.org \ --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: 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.