efi: Warn if trying to reserve memory under Xen

Doing so cannot work and should never happen.

Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Tested-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 19c1191e6210b97c26ac85d29e6dce13610f154e..d4023ea1ccffa044b625f1c0a94ae456ada69a68 100644 (file)
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -541,6 +541,10 @@ void __init __weak efi_arch_mem_reserve(phys_addr_t addr, u64 size) {}
  */
 void __init efi_mem_reserve(phys_addr_t addr, u64 size)
 {
+       /* efi_mem_reserve() does not work under Xen */
+       if (WARN_ON_ONCE(efi_enabled(EFI_PARAVIRT)))
+               return;
+
        if (!memblock_is_region_reserved(addr, size))
                memblock_reserve(addr, size);