This is an alternate approach to addressing the issue that Demi Marie is attempting to fix in [0] (i.e., ESRT config table exposed to a x86 dom0 is corrupted because it resides in boot services memory as per the EFI spec, where it gets corrupted by Xen). My main objection to that approach is that it needs Xen-specific fixes in multiple different places, but we still end up only fixing the ESRT case specifically. So instead, I am proposing this series as a more generic way to handle configuration tables that reside in boot services memory, and confining the Xen specific logic to the Xen EFI glue code. Given that EFI boot without a memory map is only permitted on x86 and only when doing Xen boot, let's clear up some inconsistencies there first so we can set the EFI_PARAVIRT flag on all architectures that do pseudo-EFI boot straight into the core kernel (i.e., without going through the stub). This moves a good chunk of EFI memory map manipulation code into the x86 arch tree, where it arguably belongs as no other architectures rely on it. This is implemented in patches 1 - 3. Patch #4 updates the configuration table iteration logic so that only ACPI and SMBIOS tables are exposed automatically when EFI_PARAVIRT is set, and other config tables only if they reside in a memory region of a EFI memory type that is guaranteed to be preserved. This effectively hides the ESRT, but also the memory attributes table and the runtime properties (and potentially others) when doing Xen dom0 boot unless they have been moved out of EFI boot services memory. The final patch relaxes the ESRT sanity check so that the ESRT is parsed and exposed even if EFI_MEMMAP is not set, which is the case with Xen dom0 on x86. If additional memory map checks are required in this code path, the best way to achieve this is for Xen to expose a EFI memory map on x86 just like it does on other architectures that support Xen (ARM and arm64) [0] https://lore.kernel.org/all/cover.1664298147.git.demi@xxxxxxxxxxxxxxxxxxxxxx/ Cc: Demi Marie Obenour <demi@xxxxxxxxxxxxxxxxxxxxxx> Cc: Peter Jones <pjones@xxxxxxxxxx> Cc: Juergen Gross <jgross@xxxxxxxx> Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx> Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@xxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Anton Vorontsov <anton@xxxxxxxxxx> Cc: Colin Cross <ccross@xxxxxxxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Cc: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx> Ard Biesheuvel (5): efi: Move EFI fake memmap support into x86 arch tree efi: memmap: Move manipulation routines into x86 arch tree efi: xen: Set EFI_PARAVIRT for Xen dom0 boot on all architectures efi: Apply allowlist to EFI configuration tables when running under Xen efi: esrt: Omit region sanity check when no memory map is available arch/x86/Kconfig | 20 ++ arch/x86/include/asm/efi.h | 16 ++ arch/x86/kernel/setup.c | 1 + arch/x86/platform/efi/Makefile | 4 +- arch/x86/platform/efi/efi.c | 8 +- {drivers/firmware => arch/x86/platform}/efi/fake_mem.c | 79 ++++++- arch/x86/platform/efi/memmap.c | 238 ++++++++++++++++++++ arch/x86/platform/efi/quirks.c | 3 + drivers/firmware/efi/Kconfig | 22 -- drivers/firmware/efi/Makefile | 4 - drivers/firmware/efi/efi.c | 7 + drivers/firmware/efi/esrt.c | 61 ++--- drivers/firmware/efi/fake_mem.h | 10 - drivers/firmware/efi/fdtparams.c | 4 + drivers/firmware/efi/memmap.c | 224 +----------------- drivers/firmware/efi/x86_fake_mem.c | 75 ------ drivers/xen/efi.c | 69 ++++++ include/linux/efi.h | 18 +- 18 files changed, 481 insertions(+), 382 deletions(-) rename {drivers/firmware => arch/x86/platform}/efi/fake_mem.c (58%) create mode 100644 arch/x86/platform/efi/memmap.c delete mode 100644 drivers/firmware/efi/fake_mem.h delete mode 100644 drivers/firmware/efi/x86_fake_mem.c -- 2.35.1
