diff options
| author | Tom Rini <trini@konsulko.com> | 2025-06-26 13:45:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-06-26 13:45:43 -0600 |
| commit | 778c552f86ab781abd8360592ff261707fdefaa7 (patch) | |
| tree | 6d483f4fe8d922d6b194b8e19e813fc29cf48054 /test | |
| parent | 7d4eacb0e68a7eb471a8dc43a5585b46ec67a333 (diff) | |
| parent | 788df0536237321efcd443c74316d37451bde31c (diff) | |
Merge patch series "sandbox: align LMB memory"
Heinrich Schuchardt <heinrich.schuchardt@canonical.com> says:
To implement the EFI_SYSTEM_TABLE_POINTER we need 4 MiB aligned
memory.
On the sandbox LMB uses addresses relative to the start of a page aligned
RAM buffer allocated with mmap(). This leads to a mismatch of alignment
between EFI which uses pointers and LMB which uses phys_addr_t.
Ensure that the RAM buffer used for LMB is 4 MiB aligned.
Provide a unit test for efi_alloc_aligned_pages() verifying this alignment.
Do not overwrite RAM size in dram_init().
Link: https://lore.kernel.org/r/20250608075428.32631-1-heinrich.schuchardt@canonical.com
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/Makefile | 2 | ||||
| -rw-r--r-- | test/lib/efi_memory.c | 63 |
2 files changed, 64 insertions, 1 deletions
diff --git a/test/lib/Makefile b/test/lib/Makefile index ff4ff63270d..35b40b584c4 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_$(PHASE_)UT_COMPRESSION) += compression.o ifeq ($(CONFIG_XPL_BUILD),) obj-y += abuf.o obj-y += alist.o -obj-$(CONFIG_EFI_LOADER) += efi_device_path.o +obj-$(CONFIG_EFI_LOADER) += efi_device_path.o efi_memory.o obj-$(CONFIG_EFI_SECURE_BOOT) += efi_image_region.o obj-y += hexdump.o obj-$(CONFIG_SANDBOX) += kconfig.o diff --git a/test/lib/efi_memory.c b/test/lib/efi_memory.c new file mode 100644 index 00000000000..d2e1ab6b4a3 --- /dev/null +++ b/test/lib/efi_memory.c @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Test memory functions + * + * Copyright (c) 2025 Heinrich Schuchardt <xypron.glpk@gmx.de> + */ + +#include <efi_loader.h> +#include <test/lib.h> +#include <test/test.h> +#include <test/ut.h> + +static int lib_test_efi_alloc_aligned_pages(struct unit_test_state *uts) +{ + efi_status_t ret; + + void *addr; + unsigned long align = 0x400000; + + addr = efi_alloc_aligned_pages(4096, EFI_PERSISTENT_MEMORY_TYPE, + EFI_PAGE_SIZE); + ut_asserteq_ptr(NULL, addr); + + addr = efi_alloc_aligned_pages(4096, 0x6FFFFFFF, EFI_PAGE_SIZE); + ut_asserteq_ptr(NULL, addr); + + align = 0x200; + addr = efi_alloc_aligned_pages(4096, EFI_ACPI_RECLAIM_MEMORY, align); + ut_assertnonnull(addr); + ut_asserteq_64(0, (uintptr_t)addr & (align - 1)); + + ret = efi_free_pages((uintptr_t) addr, 1); + ut_asserteq_64(ret, EFI_SUCCESS); + + align = 0x400000; + addr = efi_alloc_aligned_pages(4096, EFI_ACPI_RECLAIM_MEMORY, align); + ut_assertnonnull(addr); + ut_asserteq_64(0, (uintptr_t)addr & (align - 1)); + + ret = efi_free_pages((uintptr_t) addr, 1); + ut_asserteq_64(ret, EFI_SUCCESS); + + return 0; +} +LIB_TEST(lib_test_efi_alloc_aligned_pages, 0); + +static int lib_test_efi_allocate_pages(struct unit_test_state *uts) +{ + efi_status_t ret; + u64 memory; + + ret = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, + EFI_ACPI_RECLAIM_MEMORY, + 1, &memory); + ut_asserteq_64(ret, EFI_SUCCESS); + ut_asserteq_64(0, memory & EFI_PAGE_MASK); + + ret = efi_free_pages(memory, 1); + ut_asserteq_64(ret, EFI_SUCCESS); + + return 0; +} +LIB_TEST(lib_test_efi_allocate_pages, 0); |