From: andre4ik3 <little.ice3735@fastmail.com>
Date: Thu, 14 Nov 2024 04:20:09 +0000 (+0400)
Subject: boot/stub: allocate pages for combined initrds below 4GiB only on x86 (#35149)
X-Git-Tag: v257-rc2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e207b370e91e681efb08c497a6c8ad78e3c8d83;p=thirdparty%2Fsystemd.git

boot/stub: allocate pages for combined initrds below 4GiB only on x86 (#35149)

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
---

diff --git a/src/boot/boot.c b/src/boot/boot.c
index 87b0232860f..129d6f8f5d3 100644
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -2469,11 +2469,7 @@ static EFI_STATUS initrd_prepare(
                         return EFI_OUT_OF_RESOURCES;
         }
 
-        _cleanup_pages_ Pages pages = xmalloc_pages(
-                AllocateMaxAddress,
-                EfiLoaderData,
-                EFI_SIZE_TO_PAGES(size),
-                UINT32_MAX /* Below 4G boundary. */);
+        _cleanup_pages_ Pages pages = xmalloc_initrd_pages(size);
         uint8_t *p = PHYSICAL_ADDRESS_TO_POINTER(pages.addr);
 
         STRV_FOREACH(i, entry->initrd) {
diff --git a/src/boot/stub.c b/src/boot/stub.c
index 7261e942d33..c92df686c8a 100644
--- a/src/boot/stub.c
+++ b/src/boot/stub.c
@@ -114,12 +114,9 @@ static EFI_STATUS combine_initrds(
                 n += initrd_size;
         }
 
-        _cleanup_pages_ Pages pages = xmalloc_pages(
-                        AllocateMaxAddress,
-                        EfiLoaderData,
-                        EFI_SIZE_TO_PAGES(n),
-                        UINT32_MAX /* Below 4G boundary. */);
+        _cleanup_pages_ Pages pages = xmalloc_initrd_pages(n);
         uint8_t *p = PHYSICAL_ADDRESS_TO_POINTER(pages.addr);
+
         FOREACH_ARRAY(i, initrds, n_initrds) {
                 size_t pad;
 
diff --git a/src/boot/util.h b/src/boot/util.h
index c7634576cf4..3164d520bd2 100644
--- a/src/boot/util.h
+++ b/src/boot/util.h
@@ -99,6 +99,22 @@ static inline Pages xmalloc_pages(
         };
 }
 
+static inline Pages xmalloc_initrd_pages(size_t n_pages) {
+#if defined(__i386__) || defined(__x86_64__)
+        return xmalloc_pages(
+                        AllocateMaxAddress,
+                        EfiLoaderData,
+                        EFI_SIZE_TO_PAGES(n_pages),
+                        UINT32_MAX /* Below 4G boundary. */);
+#else
+        return xmalloc_pages(
+                        AllocateAnyPages,
+                        EfiLoaderData,
+                        EFI_SIZE_TO_PAGES(n_pages),
+                        0 /* Ignored. */);
+#endif
+}
+
 void convert_efi_path(char16_t *path);
 char16_t *xstr8_to_path(const char *stra);
 char16_t *mangle_stub_cmdline(char16_t *cmdline);