shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-03 05:18:09 +03:00
Code

boot: allocate cleanup pages below 4GiB only on x86

Browse Source 
Outside of x86, some machines (e.g. Apple silicon, AMD Opteron A1100) have
physical memory mapped above 4GiB, meaning this allocation will fail, causing
the entire boot process to fail on these machines.

This commit makes it so that the below-4GB address space allocation requirement
is only set on x86 platforms, and not on other platforms (that don't have the
specific Linux x86 boot protocol), thereby fixing boot on those that have no
memory mapped below 4GiB in their address space.

Tested on an Apple silicon M1 laptop and an AMD x86_64 desktop tower.

Fixes: #35026

Manual backport of 6e207b370e.
This commit is contained in:
andre4ik3 2024-11-13 18:53:25 +04:00 committed by Luca Boccassi
parent 018c7fb18a
commit a9d9db7f4e
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/boot/efi/boot.c
View File

@ -2296,11 +2296,20 @@ static EFI_STATUS initrd_prepare(
return EFI_OUT_OF_RESOURCES;
}
#if defined(__i386__) || defined(__x86_64__)
_cleanup_pages_ Pages pages = xmalloc_pages(
AllocateMaxAddress,
EfiLoaderData,
EFI_SIZE_TO_PAGES(size),
UINT32_MAX /* Below 4G boundary. */);
#else
_cleanup_pages_ Pages pages = xmalloc_pages(
AllocateAnyPages,
EfiLoaderData,
EFI_SIZE_TO_PAGES(size),
0 /* Ignored. */);
#endif
uint8_t *p = PHYSICAL_ADDRESS_TO_POINTER(pages.addr);
STRV_FOREACH(i, entry->initrd) {

9
src/boot/efi/stub.c
View File

@ -49,11 +49,20 @@ static EFI_STATUS combine_initrds(
n += initrd_size;
}
#if defined(__i386__) || defined(__x86_64__)
_cleanup_pages_ Pages pages = xmalloc_pages(
AllocateMaxAddress,
EfiLoaderData,
EFI_SIZE_TO_PAGES(n),
UINT32_MAX /* Below 4G boundary. */);
#else
_cleanup_pages_ Pages pages = xmalloc_pages(
AllocateAnyPages,
EfiLoaderData,
EFI_SIZE_TO_PAGES(n),
0 /* Ignored. */);
#endif
uint8_t *p = PHYSICAL_ADDRESS_TO_POINTER(pages.addr);
for (size_t i = 0; i < n_initrds; i++) {
if (!initrds[i])