efi: Fix alignenment issues in unaccepted memory code
Subsystems (2)
v2 cover efi: Fix alignenment issues in unaccepted memory code
This series addresses two issues related to unaligned physical addresses and sizes when handling EFI unaccepted memory. These issues were identified as potential sources of kernel panics in Intel TDX environments due to incomplete memory reservation or missing "guard page" extensions.
The first patch fixes the reservation of the unaccepted memory table itself in efi_config_parse_tables(). It ensures the entire page range covering the table is reserved even if the table doesn't start on a page boundary.
The second patch ensures that memory acceptance requests in accept_memory() and range_contains_unaccepted_memory() are page-aligned before performing the unit_size alignment check. This prevents skipping the necessary "guard page" extension for unaligned ranges, which is required to avoid crashes with load_unaligned_zeropad().
v2:
- Fix 'end' calculation in the second patch (Tom)
Kiryl Shutsemau (Meta) (2):
efi: Fix reservation of unaccepted memory table
efi: Align unaccepted memory range to page boundary
drivers/firmware/efi/efi.c | 8 ++++---- drivers/firmware/efi/unaccepted_memory.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-)
Signature · 1 line
2.51.2
PATCH v2 1/2 efi: Fix reservation of unaccepted memory table
The reserve_unaccepted() function incorrectly calculates the size of the memblock reservation for the unaccepted memory table. It aligns the size of the table, but fails to account for cases where the table's starting physical address (efi.unaccepted) is not page-aligned.
If the table starts at an offset within a page and its end crosses into a subsequent page that the aligned size does not cover, the end of the table will not be reserved. This can lead to the table being overwritten or inaccessible, causing a kernel panic in accept_memory().
This issue was observed when starting Intel TDX VMs with specific memory sizes (e.g., > 64GB).
Fix this by calculating the end address first (including the unaligned start) and then aligning it up, ensuring the entire range is covered by the reservation.
--- drivers/firmware/efi/efi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/firmware/efi/efi.c +4 -4
@@ -692,13 +692,13 @@ static __init int match_config_table(const efi_guid_t *guid,static __init void reserve_unaccepted (struct efi_unaccepted_memory *unaccepted) { -phys_addr_t start, size; +phys_addr_t start, end; start =PAGE_ALIGN_DOWN (efi.unaccepted); - size =PAGE_ALIGN (sizeof (*unaccepted) + unaccepted->size); + end =PAGE_ALIGN (efi.unaccepted +sizeof (*unaccepted) + unaccepted->size); -memblock_add (start, size); -memblock_reserve (start, size); +memblock_add (start, end - start); +memblock_reserve (start, end - start); } int __init efi_config_parse_tables(const efi_config_table_t *config_tables,
Signature · 1 line
2.51.2
PATCH v2 2/2 efi: Align unaccepted memory range to page boundary
In reply to Kiryl Shutsemau (Meta)The accept_memory() and range_contains_unaccepted_memory() functions employ a "guard page" logic to prevent crashes with load_unaligned_zeropad(). This logic extends the range to be accepted (or checked) by one unit_size if the end of the range is aligned to a unit_size boundary.
However, if the caller passes a range that is not page-aligned, the 'end' of the range might not be numerically aligned to unit_size, even if it covers the last page of a unit. This causes the "if (!(end % unit_size))" check to fail, skipping the necessary extension and leaving the next unit unaccepted, which can lead to a kernel panic when accessed by load_unaligned_zeropad().
Align the start address down and the size up to the nearest page boundary before performing the unit_size alignment check. This ensures that the guard unit is correctly added when the range effectively ends on a unit boundary.
--- drivers/firmware/efi/unaccepted_memory.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/firmware/efi/unaccepted_memory.c +8 -2
@@ -35,14 +35,17 @@ void accept_memory(phys_addr_t start, unsigned long size)struct efi_unaccepted_memory *unaccepted;unsigned long range_start, range_end;struct accept_range range, *entry; -phys_addr_t end = start + size;unsigned long flags; +phys_addr_t end;u64 unit_size; unaccepted =efi_get_unaccepted_table ();if (!unaccepted)return ; + end =PAGE_ALIGN (start + size); + start =PAGE_ALIGN_DOWN (start); + unit_size = unaccepted->unit_size;/*
@@ -160,15 +163,18 @@ void accept_memory(phys_addr_t start, unsigned long size)bool range_contains_unaccepted_memory (phys_addr_t start,unsigned long size) {struct efi_unaccepted_memory *unaccepted; -phys_addr_t end = start + size;unsigned long flags;bool ret = false; +phys_addr_t end;u64 unit_size; unaccepted =efi_get_unaccepted_table ();if (!unaccepted)return false; + end =PAGE_ALIGN (start + size); + start =PAGE_ALIGN_DOWN (start); + unit_size = unaccepted->unit_size;/*
Signature · 1 line
2.51.2
Ard Biesheuvel
maintainerQuoted 20 lines · Kiryl Shutsemau (Meta)
This series addresses two issues related to unaligned physical addresses and sizes when handling EFI unaccepted memory. These issues were identified as potential sources of kernel panics in Intel TDX environments due to incomplete memory reservation or missing "guard page" extensions.
The first patch fixes the reservation of the unaccepted memory table itself in
efi_config_parse_tables(). It ensures the entire page range covering the table is reserved even if the table doesn't start on a page boundary.The second patch ensures that memory acceptance requests in
accept_memory()andrange_contains_unaccepted_memory()are page-aligned before performing theunit_sizealignment check. This prevents skipping the necessary "guard page" extension for unaligned ranges, which is required to avoid crashes withload_unaligned_zeropad().v2:
- Fix 'end' calculation in the second patch (Tom)
Quoted 8 lines
Kiryl Shutsemau (Meta) (2):
efi: Fix reservation of unaccepted memory table
efi: Align unaccepted memory range to page boundarydrivers/firmware/efi/efi.c | 8 ++++---- drivers/firmware/efi/unaccepted_memory.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-)
This looks fine to me. If other folks are happy too, I'll queue it up and get it to Linus by the end of the week.
Quoted 17 lines · Kiryl Shutsemau (Meta)
This series addresses two issues related to unaligned physical addresses and sizes when handling EFI unaccepted memory. These issues were identified as potential sources of kernel panics in Intel TDX environments due to incomplete memory reservation or missing "guard page" extensions.
The first patch fixes the reservation of the unaccepted memory table itself in
efi_config_parse_tables(). It ensures the entire page range covering the table is reserved even if the table doesn't start on a page boundary.The second patch ensures that memory acceptance requests in
accept_memory()andrange_contains_unaccepted_memory()are page-aligned before performing theunit_sizealignment check. This prevents skipping the necessary "guard page" extension for unaligned ranges, which is required to avoid crashes withload_unaligned_zeropad().
Quoted 6 lines
v2:
- Fix 'end' calculation in the second patch (Tom)Kiryl Shutsemau (Meta) (2):
efi: Fix reservation of unaccepted memory table
efi: Align unaccepted memory range to page boundary
Quoted 7 lines
drivers/firmware/efi/efi.c | 8 ++++---- drivers/firmware/efi/unaccepted_memory.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-)Signature · 1 line
2.51.2
Signature · 2 lines
Sincerely yours, Mike.
Quoted 20 lines · Kiryl Shutsemau (Meta)
This series addresses two issues related to unaligned physical addresses and sizes when handling EFI unaccepted memory. These issues were identified as potential sources of kernel panics in Intel TDX environments due to incomplete memory reservation or missing "guard page" extensions.
The first patch fixes the reservation of the unaccepted memory table itself in
efi_config_parse_tables(). It ensures the entire page range covering the table is reserved even if the table doesn't start on a page boundary.The second patch ensures that memory acceptance requests in
accept_memory()andrange_contains_unaccepted_memory()are page-aligned before performing theunit_sizealignment check. This prevents skipping the necessary "guard page" extension for unaligned ranges, which is required to avoid crashes withload_unaligned_zeropad().v2:
- Fix 'end' calculation in the second patch (Tom)
Quoted 7 lines
Kiryl Shutsemau (Meta) (2):
efi: Fix reservation of unaccepted memory table
efi: Align unaccepted memory range to page boundarydrivers/firmware/efi/efi.c | 8 ++++---- drivers/firmware/efi/unaccepted_memory.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-)
Quoted 1 line
Ard Biesheuvel
maintainerQuoted 25 lines · Tom Lendacky
Quoted 24 lines · Kiryl Shutsemau (Meta)
This series addresses two issues related to unaligned physical addresses and sizes when handling EFI unaccepted memory. These issues were identified as potential sources of kernel panics in Intel TDX environments due to incomplete memory reservation or missing "guard page" extensions.
The first patch fixes the reservation of the unaccepted memory table itself in
efi_config_parse_tables(). It ensures the entire page range covering the table is reserved even if the table doesn't start on a page boundary.The second patch ensures that memory acceptance requests in
accept_memory()andrange_contains_unaccepted_memory()are page-aligned before performing theunit_sizealignment check. This prevents skipping the necessary "guard page" extension for unaligned ranges, which is required to avoid crashes withload_unaligned_zeropad().v2:
- Fix 'end' calculation in the second patch (Tom)Kiryl Shutsemau (Meta) (2):
efi: Fix reservation of unaccepted memory table
efi: Align unaccepted memory range to page boundary
Quoted 6 lines
Quoted 3 lines
drivers/firmware/efi/efi.c | 8 ++++---- drivers/firmware/efi/unaccepted_memory.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-)Reviewed-by Tom Lendacky <[email protected]>
Thanks - I've queued this up now.