x86/efi: Re-enable memory attributes table for kexec
v2 cover x86/efi: Re-enable memory attributes table for kexec
From: Ard Biesheuvel <[email protected]>
The EFI memory attributes table augments the EFI memory map, and provides permission attributes for all runtime code and data regions that are otherwise mapped read-write-execute in their entirety.
Currently, this table is disregarded when doing kexec boot on x86, for two reasons:
- the boot services data region that holds the table is not reserved correctly, and may contain garbage at kexec time
- a misguided sanity check on the size of the table is likely to trigger on kexec, as the EFI memory map has been trimmed down by that time.
Fix both issues, so that the EFI memory attributes table can be taken into account again at kexec time. Note that this requires that the call to efi_memattr_init() is moved to a later point for x86.
Changes since v1:
- Sanity check the descriptor size and entry count individually: this prevents integer overflow, and avoid noisy diagnostics when using kexec_load(), which reconstructs the EFI memory map using a different descriptor size.
- Apply Gregory's Rb to patch #1 (but not patch #1)
I'd like to take this through the EFI tree as a whole, or take the first patch now (which is a fix) and leave the rest for -tip during the next cycle. (Patches #3 and #4 should be queued together in any case)
Ard Biesheuvel (5):
efi/memattr: Fix thinko in table size sanity check x86/efi: Gather initial memory reservation and table handling logic x86/efi: Defer the call to efi_memattr_init()
efi: Use efi_mem_reserve() to reserve the memory attribute table x86/efi: Drop kexec quirk for the EFI memory attributes table
arch/x86/include/asm/efi.h | 5 +-- arch/x86/kernel/setup.c | 11 +----- arch/x86/platform/efi/efi.c | 15 ++++++++ arch/x86/platform/efi/quirks.c | 4 -- drivers/firmware/efi/efi.c | 2 +- drivers/firmware/efi/memattr.c | 39 +++++++++++++++----- 6 files changed, 49 insertions(+), 27 deletions(-)
base-commit: d0c3bcd5b8976159d835a897254048e078f447e6
Signature · 1 line
2.53.0.1118.gaef5881109-goog
PATCH v2 1/5 efi/memattr: Fix thinko in table size sanity check
From: Ard Biesheuvel <[email protected]>
While it is true that each PE/COFF runtime driver in memory can generally be split into 3 different regions (the header, the code/rodata region and the data/bss region), each with different permissions, it does not mean that 3x the size of the memory map is a suitable upper bound. This is due to the fact that all runtime drivers could be coalesced into a single EFI runtime code region by the firmware, and if the firmware does a good job of keeping the fragmentation down, it is conceivable that the memory attributes table has more entries than the EFI memory map itself.
So instead, base the sanity check on whether the descriptor size matches the EFI memory map's descriptor size closely enough (which is not mandated by the spec but extremely unlikely to differ in practice), and whether the size of the whole table does not exceed 64k entries.
--- drivers/firmware/efi/memattr.c | 37 +++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-)
drivers/firmware/efi/memattr.c +28 -9
@@ -22,7 +22,6 @@ unsigned long __ro_after_init efi_mem_attr_table = EFI_INVALID_TABLE_ADDR;void __init efi_memattr_init (void ) {efi_memory_attributes_table_t *tbl; -unsigned long size;if (efi_mem_attr_table ==EFI_INVALID_TABLE_ADDR )return ;
@@ -40,22 +39,42 @@ void __init efi_memattr_init(void) goto unmap; } +/* +* The EFI memory attributes table descriptors might potentially be +* smaller than those used by the EFI memory map, as long as they can +* fit a efi_memory_desc_t. However, a larger descriptor size makes no +* sense, and might be an indication that the table is corrupted. +* +* The only exception is kexec_load(), where the EFI memory map is +* reconstructed by user space, and may use a smaller descriptor size +* than the original. Given that, ignoring this companion table is +* still the right thing to do here, but don't complain too loudly when +* this happens. +*/ +if (tbl->desc_size <sizeof (efi_memory_desc_t) || + tbl->desc_size > efi.memmap.desc_size) { +pr_warn ("Unexpected EFI Memory Attributes descriptor size %d (expected: %ld)\n" , + tbl->desc_size, efi.memmap.desc_size); + goto unmap; + }/* -* Sanity check: the Memory Attributes Table contains up to 3 entries -* for each entry of type EfiRuntimeServicesCode in the EFI memory map. -* So if the size of the table exceeds 3x the size of the entire EFI -* memory map, there is clearly something wrong, and the table should -* just be ignored altogether. +* Sanity check: the Memory Attributes Table contains multiple entries +* for each EFI runtime services code or data region in the EFI memory +* map, each with the permission attributes that may be applied when +* mapping the region. There is no upper bound for the number of +* entries, as it could conceivably contain more entries than the EFI +* memory map itself. So pick an arbitrary limit of 64k, which is +* ludicrously high. This prevents a corrupted table from eating all +* system RAM. */ - size = tbl->num_entries * tbl->desc_size; -if (size >3 * efi.memmap.nr_map * efi.memmap.desc_size) { +if (tbl->num_entries >SZ_64K ) {pr_warn (FW_BUG "Corrupted EFI Memory Attributes Table detected! (version == %u, desc_size == %u, num_entries == %u)\n" , tbl->version, tbl->desc_size, tbl->num_entries); goto unmap; } - tbl_size =sizeof (*tbl) + size; + tbl_size =sizeof (*tbl) + tbl->num_entries * tbl->desc_size;memblock_reserve (efi_mem_attr_table, tbl_size);set_bit (EFI_MEM_ATTR , &efi.flags);
Signature · 1 line
2.53.0.1118.gaef5881109-goog
Re: [PATCH v2 1/5] efi/memattr: Fix thinko in table size sanity check
drivers/firmware/efi/memattr.c void __init efi_memattr_init(void) · line 57
Quoted 4 lines · Ard Biesheuvel
drivers/firmware/efi/memattr.c +4
-0+if (tbl->desc_size <sizeof (efi_memory_desc_t) || + tbl->desc_size > efi.memmap.desc_size) { +pr_warn ("Unexpected EFI Memory Attributes descriptor size %d (expected: %ld)\n" , + tbl->desc_size, efi.memmap.desc_size);
Should tbl->desc_size be printed as %u and %lu? tbl->desc_size is u32 and. The pr_warn a few lines below already uses %u for the same field:
Quoted 2 lines
drivers/firmware/efi/memattr.c +0
-0pr_warn (FW_BUG "Corrupted EFI Memory Attributes Table detected! (version == %u, desc_size == %u, num_entries == %u)\n" , tbl->version, tbl->desc_size, tbl->num_entries);
Ard Biesheuvel
maintainerRe: [PATCH v2 1/5] efi/memattr: Fix thinko in table size sanity check
Quoted 9 lines · Breno Leitao
drivers/firmware/efi/memattr.c void __init efi_memattr_init(void) · line 57
Quoted 4 lines · Ard Biesheuvel
drivers/firmware/efi/memattr.c +4
-0+if (tbl->desc_size <sizeof (efi_memory_desc_t) || + tbl->desc_size > efi.memmap.desc_size) { +pr_warn ("Unexpected EFI Memory Attributes descriptor size %d (expected: %ld)\n" , + tbl->desc_size, efi.memmap.desc_size);Should
tbl->desc_sizebe printed as %u and %lu?tbl->desc_sizeis u32 and. Thepr_warna few lines below already uses %u for the same field:
Yes, good point - will fix.
Breno Leitao
Reviewed-byRe: [PATCH v2 1/5] efi/memattr: Fix thinko in table size sanity check
Quoted 12 lines · Ard Biesheuvel
Quoted 9 lines · Breno Leitao
drivers/firmware/efi/memattr.c void __init efi_memattr_init(void) · line 57
Quoted 4 lines · Ard Biesheuvel
drivers/firmware/efi/memattr.c +4
-0+if (tbl->desc_size <sizeof (efi_memory_desc_t) || + tbl->desc_size > efi.memmap.desc_size) { +pr_warn ("Unexpected EFI Memory Attributes descriptor size %d (expected: %ld)\n" , + tbl->desc_size, efi.memmap.desc_size);Should
tbl->desc_sizebe printed as %u and %lu?tbl->desc_sizeis u32 and. Thepr_warna few lines below already uses %u for the same field:
Quoted 1 line
Yes, good point - will fix.
Thanks. With the fix, please add:
PATCH v2 2/5 x86/efi: Gather initial memory reservation and table handling logic
In reply to Ard BiesheuvelFrom: Ard Biesheuvel <[email protected]>
Move the back-to-back calls to various EFI routines related to processing of firmware tables and reserving the associated memory into a helper function. This is tidier, and will avoid the need to add yet another function call there in a subsequent patch.
--- arch/x86/include/asm/efi.h | 5 ++--- arch/x86/kernel/setup.c | 11 ++--------- arch/x86/platform/efi/efi.c | 13 +++++++++++++ 3 files changed, 17 insertions(+), 12 deletions(-)
arch/x86/include/asm/efi.h +2 -3
@@ -387,11 +387,10 @@ static inline bool efi_is_table_address(unsigned long phys_addr) {return false; } -static inline void efi_reserve_boot_services (void ) -{ -}#endif /* CONFIG_EFI */ +void efi_init_reservations (void ); +extern int __init efi_memmap_alloc (unsigned int num_entries,struct efi_memory_map_data *data);
arch/x86/kernel/setup.c +2 -9
@@ -1083,15 +1083,8 @@ void __init setup_arch(char **cmdline_p)mem_encrypt_setup_arch ();cc_random_init (); -efi_find_mirror (); -efi_esrt_init (); -efi_mokvar_table_init (); - -/* -* The EFI specification says that boot service code won't be -* called after ExitBootServices(). This is, in fact, a lie. -*/ -efi_reserve_boot_services (); +if (efi_enabled (EFI_BOOT )) +efi_init_reservations ();/* preallocate 4k for mptable mpc */ e820__memblock_alloc_reserved_mpc_new ();
arch/x86/platform/efi/efi.c +13 -0
@@ -165,6 +165,19 @@ static void __init do_add_efi_memmap(void)e820__update_table (e820_table); } +void __init efi_init_reservations (void ) +{ +efi_find_mirror (); +efi_esrt_init (); +efi_mokvar_table_init (); + +/* +* The EFI specification says that boot service code won't be +* called after ExitBootServices(). This is, in fact, a lie. +*/ +efi_reserve_boot_services (); +} +/* * Given add_efi_memmap defaults to 0 and there is no alternative * e820 mechanism for soft-reserved memory, import the full EFI memory
Signature · 1 line
2.53.0.1118.gaef5881109-goog
Re: [PATCH v2 2/5] x86/efi: Gather initial memory reservation and table handling logic
Quoted 9 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
Move the back-to-back calls to various EFI routines related to processing of firmware tables and reserving the associated memory into a helper function. This is tidier, and will avoid the need to add yet another function call there in a subsequent patch.
Reviewed-by Gregory Price <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>
Quoted 1 line
+void
efi_init_reservations(void);
Do you neeed __init here, as the declaration below? I know that "extern" is not necessary, but isn't __init?
extern int __init efi_memmap_alloc(unsigned int num_entries,
struct efi_memory_map_data *data);
extern int __init efi_memmap_install(struct efi_memory_map_data *data); extern int __init efi_memmap_split_count(efi_memory_desc_t *md,
Ard Biesheuvel
maintainerRe: [PATCH v2 2/5] x86/efi: Gather initial memory reservation and table handling logic
Quoted 8 lines · Breno Leitao
Quoted 7 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
Move the back-to-back calls to various EFI routines related to processing of firmware tables and reserving the associated memory into a helper function. This is tidier, and will avoid the need to add yet another function call there in a subsequent patch.
Quoted 5 lines
Quoted 2 lines
Reviewed-by Gregory Price <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>Reviewed-by Breno Leitao <[email protected]>
Thanks
Quoted 5 lines
Quoted 1 line
+void
efi_init_reservations(void);Do you neeed
__inithere, as the declaration below? I know that "extern" is not necessary, but isn't__init?
No, it's not. Initness is a property of the definition not the declaration. It decides which ELF section the code is emitted into, and a declaration does not produce any code.
The section attribute is permitted on declarations by most compilers, and I can see how it may be informative, but it can also easily get out of sync so I prefer to omit it.
PATCH v2 3/5 x86/efi: Defer the call to efi_memattr_init()
In reply to Ard BiesheuvelFrom: Ard Biesheuvel <[email protected]>
efi_memattr_init() should call efi_mem_reserve() rather than memblock_reserve() to preserve the memory contents of the region when the EFI memory attributes table is loaded by the firmware.
However, efi_mem_reserve() can only be called later during the boot on x86, due to the fact that it may need to memblock_alloc() memory for the EFI memory map.
So move the call to efi_memattr_init() to a later stage when building for x86_64.
--- arch/x86/platform/efi/efi.c | 2 ++ drivers/firmware/efi/efi.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
arch/x86/platform/efi/efi.c +2 -0
@@ -167,6 +167,8 @@ static void __init do_add_efi_memmap(void)void __init efi_init_reservations (void ) { +if (IS_ENABLED (CONFIG_X86_64 ) &&efi_enabled (EFI_MEMMAP )) +efi_memattr_init ();efi_find_mirror ();efi_esrt_init ();efi_mokvar_table_init ();
drivers/firmware/efi/efi.c +1 -1
@@ -761,7 +761,7 @@ int __init efi_config_parse_tables(const efi_config_table_t *config_tables, } } -if (!IS_ENABLED (CONFIG_X86_32 ) &&efi_enabled (EFI_MEMMAP )) +if (!IS_ENABLED (CONFIG_X86 ) &&efi_enabled (EFI_MEMMAP ))efi_memattr_init ();efi_tpm_eventlog_init ();
Signature · 1 line
2.53.0.1118.gaef5881109-goog
Re: [PATCH v2 3/5] x86/efi: Defer the call to efi_memattr_init()
Quoted 6 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
efi_memattr_init()should callefi_mem_reserve()rather thanmemblock_reserve()to preserve the memory contents of the region when the EFI memory attributes table is loaded by the firmware.
Quoted 8 lines
However,
efi_mem_reserve()can only be called later during the boot on x86, due to the fact that it may need tomemblock_alloc()memory for the EFI memory map.So move the call to
efi_memattr_init()to a later stage when building forx86_64.Signed-off-by Ard Biesheuvel <[email protected]>
PATCH v2 4/5 efi: Use efi_mem_reserve() to reserve the memory attribute table
In reply to Ard BiesheuvelFrom: Ard Biesheuvel <[email protected]>
Use efi_mem_reserve() rather than memblock_reserve() to reserve the EFI memory attributes table. This is needed on x86, where memblock_reserve() is not sufficient for assets that may be placed in EFI boot services data memory.
--- drivers/firmware/efi/memattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/memattr.c +1 -1
@@ -75,7 +75,7 @@ void __init efi_memattr_init(void) } tbl_size =sizeof (*tbl) + tbl->num_entries * tbl->desc_size; -memblock_reserve (efi_mem_attr_table, tbl_size); +efi_mem_reserve (efi_mem_attr_table, tbl_size);set_bit (EFI_MEM_ATTR , &efi.flags); unmap:
Signature · 1 line
2.53.0.1118.gaef5881109-goog
Re: [PATCH v2 4/5] efi: Use efi_mem_reserve() to reserve the memory attribute table
Quoted 8 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
Use
efi_mem_reserve()rather thanmemblock_reserve()to reserve the EFI memory attributes table. This is needed on x86, wherememblock_reserve()is not sufficient for assets that may be placed in EFI boot services data memory.Signed-off-by Ard Biesheuvel <[email protected]>
drivers/firmware/efi/memattr.c void __init efi_memattr_init(void) · line 78
Quoted 13 lines
--- drivers/firmware/efi/memattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/firmware/efi/memattr.c +0
-1@@ -75,7 +75,7 @@ void __init efi_memattr_init(void) } tbl_size =sizeof (*tbl) + tbl->num_entries * tbl->desc_size; -memblock_reserve (efi_mem_attr_table, tbl_size);
nit: memblock_reserve seems to be the only memblock usage in the file, so after this patch, the #include <linux/memblock.h> becomes dead.
Ard Biesheuvel
maintainerRe: [PATCH v2 4/5] efi: Use efi_mem_reserve() to reserve the memory attribute table
Quoted 23 lines · Breno Leitao
Quoted 8 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
Use
efi_mem_reserve()rather thanmemblock_reserve()to reserve the EFI memory attributes table. This is needed on x86, wherememblock_reserve()is not sufficient for assets that may be placed in EFI boot services data memory.Signed-off-by Ard Biesheuvel <[email protected]>Reviewed-by Breno Leitao <[email protected]>Quoted 11 lines
--- drivers/firmware/efi/memattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/firmware/efi/memattr.c +0
-0@@ -75,7 +75,7 @@ void __init efi_memattr_init(void) }
Quoted 5 lines
drivers/firmware/efi/memattr.c void __init efi_memattr_init(void) · line 78
Quoted 2 lines
drivers/firmware/efi/memattr.c +0
-1tbl_size =sizeof (*tbl) + tbl->num_entries * tbl->desc_size; -memblock_reserve (efi_mem_attr_table, tbl_size);nit:
memblock_reserveseems to be the only memblock usage in the file, so after this patch, the #include <linux/memblock.h> becomes dead.
Thanks for spotting that. Will fix.
PATCH v2 5/5 x86/efi: Drop kexec quirk for the EFI memory attributes table
In reply to Ard BiesheuvelFrom: Ard Biesheuvel <[email protected]>
Now that the EFI memory attributes table is preserved properly, and the quirk to detect corrupted tables has been updated not to result in false positives when the number of EFI memory map entries is low compared to the number of EFI memory attributes table entries, there is no longer a need to ignore the latter when doing a kexec boot. So drop the workaround.
This reverts commit
64b45dd46e15 ("x86/efi: skip memattr table on kexec boot")
--- arch/x86/platform/efi/quirks.c | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/platform/efi/quirks.c +0 -4
@@ -611,10 +611,6 @@ int __init efi_reuse_config(u64 tables, int nr_tables)if (!efi_guidcmp (guid,SMBIOS_TABLE_GUID )) ((efi_config_table_64_t *)p)->table = data->smbios; -/* Do not bother to play with mem attr table across kexec */ -if (!efi_guidcmp (guid,EFI_MEMORY_ATTRIBUTES_TABLE_GUID )) - ((efi_config_table_64_t *)p)->table =EFI_INVALID_TABLE_ADDR ; - p += sz; }early_memunmap (tablep, nr_tables * sz);
Signature · 1 line
2.53.0.1118.gaef5881109-goog