[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v2] xen/efi: Handle efi_memmap with Xen relocating itself


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Jason Andryuk <jason.andryuk@xxxxxxx>
  • Date: Tue, 17 Nov 2026 19:50:21 -0500
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cByp1l5IDKbIGdEbw2/Oo0I2IiXL9zFRAGHMcla+V+0=; b=X+Mjksu9kwy2fxM6NGi7xnqN0R55R41DpQg4NU2DlMyYo5MaJ9FRXCjPKBhhNNqufC+hd3Y1+QlIH9FG89K46/8a70jLUXZBdB7mYTZQ23uLOBXd6yH8mV2Ahk0N4lJYJ6Ozwra4nDtyBwgufct+R9Fs3F7ipa63p7o6yOVN9t1yu3CZPNa3ci9Yd7AnE+EoDVmM5xXBAWp2MBv5ua+dKaqClCk6QSrNIgILlUis+Lj6NyKEU0Rf6E8XkkZbRNUKVAlg4PjfMhnYpn2JWss/p6tTCL7gBiPPs5ztnCSW8dVL5NLZZ0LbLqVu/5E5XKJzJWTLZJRU8r7TuL9jWk/2sQ==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A0ApsdEtmYY8+3WrDyvI9HHtmFk6qP08tqb/KRU7BYqmq3r7kWD6INdCXSRn31zJmNul7jLKBsyfB2PrPIvKcsPgJ5atH7265cn7n2Txor5soz7tua6jyPgtXZ7OJEAnv72qZoIQ33QgOe2ycG3gfg+Ij+JxFcM+p1NO4s+mYJQMzW1n081uzcxcdjxzhfXgogDnpR5eVMw07bdba8qv+RTIcGlCYd/V7mKYzVP1vVZ3ImbGg7dqGmxQej8gow4PSbJKIUtzo2qR8+EjDeiFS17sPpTgt2VLceKqCNGbpqXRydq3DaC/OTHZQzZRsSPan8LP3krNhOkM0S1KUCHWJw==
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=amd.com header.i="@amd.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck"
  • Cc: Jason Andryuk <jason.andryuk@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Bertrand Marquis <bertrand.marquis@xxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, "Volodymyr Babchuk" <Volodymyr_Babchuk@xxxxxxxx>, "Daniel P. Smith" <dpsmith@xxxxxxxxxxxxxxxxxxxx>, Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, "Andrew Cooper" <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger@xxxxxxxxxxxxxx>, Teddy Astie <teddy.astie@xxxxxxxxxx>
  • Delivery-date: Wed, 18 Nov 2026 00:50:57 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

With Xen booting via Multiboot2/GRUB on an EFI platform, and modified to
use MULTIBOOT2_LOAD_PREFERENCE_LOW, Xen relocates itself with
move_xen().

However a PVH dom0 shows:
kernel: Failed to lookup header 0x77ffd000 in Xen memory map: error -3
kernel: ACPI=0x77ffd000

... for all the Xen efi memory map lookups.  Dumping the memory map at
runtime showed it was scrubbed.  Because Xen relocated itself, the
original physical address referenced through a directmap address goes
stale.

Add efi_arch_mmap_buffer_virt() to convert from the initial value to an
appropriate runtime value.  ARM uses Boot Services AllocatePool(), so it
must continue to use DIRECTMAP_VIRT_START.

For x86, we use an offset into the loaded Xen binary at the time of the
call and add the to XEN_VIRT_START.  ebmalloc() allocates from the Xen
image memory, so it moves during relocation.  xen_phys_start is set for
xen.efi in efi_exit_boot(), but not for xen.gz, so it cannot be used.

Add a generic helper using `lea __image_base__(%rip)` to get the current
load address, and use that to calculate the offset into the Xen image.
That offset is also valid from XEN_VIRT_START.  Ensure the value passed
in is within the image.  Use the generic helper to implement
efi_arch_mmap_buffer_virt().

Fixes: c5b9805bc1f7 ("efi: create new early memory allocator")
Signed-off-by: Jason Andryuk <jason.andryuk@xxxxxxx>
---
I think it could be seen without MULTIBOOT2_LOAD_PREFERENCE_LOW if xen
chose to relocate itself.  But since grub usually loads xen high, it
doesn't relocate itself.

_end is already calculated as a rip-relative address by the compiler.  I
still added an inline asm to ensure a rip-relative value is used.  i.e.
I don't see why the compiler couldn't insert the absolute value, if it
chose to.  With CONFIG_DEBUG=n, I see the inline asm for _end removed.

v2:
Use common helper
Add ASSERT()s
---
 xen/arch/arm/efi/efi-boot.h |  5 +++++
 xen/arch/x86/efi/efi-boot.h | 24 ++++++++++++++++++++++++
 xen/common/efi/boot.c       |  2 +-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h
index 069cc68b0a..717bd8d607 100644
--- a/xen/arch/arm/efi/efi-boot.h
+++ b/xen/arch/arm/efi/efi-boot.h
@@ -449,6 +449,11 @@ static void *__init efi_arch_allocate_mmap_buffer(UINTN 
map_size)
     return ptr;
 }
 
+static void *__init efi_arch_mmap_buffer_virt(void *ptr)
+{
+    return ptr + DIRECTMAP_VIRT_START;
+}
+
 static void __init efi_arch_edd(void)
 {
 }
diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h
index d738b839ee..f35a50d091 100644
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -219,11 +219,35 @@ static void __init 
efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable,
 
 }
 
+/*
+ * Convert a runtime 1:1 physical address within the
+ * Xen image to a Xen virtual address.
+ */
+static void *__init efi_arch_image_phys_to_virt(void *ptr)
+{
+    unsigned long load_base;
+    unsigned long load_end;
+
+    /* RIP-relative address is the current Xen load address. */
+    asm ( "lea __image_base__(%%rip), %0" : "=r" (load_base) );
+    asm ( "lea _end(%%rip), %0" : "=r" (load_end) );
+
+    ASSERT(ptr >= (void *)load_base);
+    ASSERT(ptr <  (void *)load_end);
+
+    return ptr - load_base + XEN_VIRT_START;
+}
+
 static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size)
 {
     return ebmalloc(map_size);
 }
 
+static void *__init efi_arch_mmap_buffer_virt(void *ptr)
+{
+    return efi_arch_image_phys_to_virt(ptr);
+}
+
 static void __init efi_arch_pre_exit_boot(void)
 {
     if ( !trampoline_phys )
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index 89b5831691..5396bad7a5 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -1425,8 +1425,8 @@ static void __init efi_exit_boot(EFI_HANDLE ImageHandle, 
EFI_SYSTEM_TABLE *Syste
     /* Adjust pointers into EFI. */
     efi_ct = (const void *)efi_ct + DIRECTMAP_VIRT_START;
     efi_rs = (const void *)efi_rs + DIRECTMAP_VIRT_START;
-    efi_memmap = (void *)efi_memmap + DIRECTMAP_VIRT_START;
     efi_fw_vendor = (const void *)efi_fw_vendor + DIRECTMAP_VIRT_START;
+    efi_memmap = efi_arch_mmap_buffer_virt(efi_memmap);
 }
 
 /* SAF-1-safe */
-- 
2.34.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.