|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH v2] xen/efi: Handle efi_memmap with Xen relocating itself
On 18.11.2026 01:50, Jason Andryuk wrote:
> 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.
It can't, as then it would violate the -fpic that we pass to it. IOW it's
really the other way around: In asm()-s we need to be careful not to
violate compiler options in effect.
> --- 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);
Hmm, is __image_base__ really the right anchor? move_xen()'s memcpy()
only covers [_start,_end).
Jan
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |