From: Demi Marie Obenour <demi@invisiblethingslab.com>
Date: Thu, 19 Jan 2023 19:04:00 +0000 (-0500)
Subject: efi: Warn if trying to reserve memory under Xen
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fa7bee867db1913560435a7486d17d95500a62dc;p=linux.git

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 19c1191e6210b..d4023ea1ccffa 100644
--- 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);