x86/efi: Apply EFI Memory Attributes after kexec
Subsystems (3)
PATCH 1/1 x86/efi: Apply EFI Memory Attributes after kexec
Kexec bypasses EFI's switch to virtual mode. In exchange, it has its own routine, kexec_enter_virtual_mode(), that replays the mappings made by the original kernel. Unfortunately, the function fails to reinstate EFI's memory attributes and runtime memory protections, which would've otherwise been set after entering virtual mode. Remediate this by calling efi_runtime_update_mappings() from it.
---
Notes:
- I tested the Memory Attributes path using QEMU/OVMF.
- Although care is taken to make sure the memory backing the EFI Memory Attributes table is preserved during runtime and reachable after kexec (see efi_memattr_init()). I don't see the same happening for the EFI properties table. Maybe it's just unnecessary as there's an assumption that the table will fall in memory preserved during runtime? Or for another reason? Otherwise, we'd need to make sure it isn't possible to set EFI_NX_PE_DATA on kexec.
arch/x86/platform/efi/efi.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/platform/efi/efi.c +1 -0
@@ -784,6 +784,7 @@ static void __init kexec_enter_virtual_mode(void)efi_sync_low_kernel_mappings ();efi_native_runtime_setup (); +efi_runtime_update_mappings ();#endif }
Signature · 1 line
2.40.1
Ard Biesheuvel
maintainerQuoted 25 lines · Nicolas Saenz Julienne
Kexec bypasses EFI's switch to virtual mode. In exchange, it has its own routine,
kexec_enter_virtual_mode(), that replays the mappings made by the original kernel. Unfortunately, the function fails to reinstate EFI's memory attributes and runtime memory protections, which would've otherwise been set after entering virtual mode. Remediate this by callingefi_runtime_update_mappings()from it.Fixes 18141e89a76c ("x86/efi: Add support for EFI_MEMORY_ATTRIBUTES_TABLE")Signed-off-by Nicolas Saenz Julienne <[email protected]>---
Notes:
- I tested the Memory Attributes path using QEMU/OVMF.- Although care is taken to make sure the memory backing the EFI Memory Attributes table is preserved during runtime and reachable after kexec (see
efi_memattr_init()). I don't see the same happening for the EFI properties table. Maybe it's just unnecessary as there's an assumption that the table will fall in memory preserved during runtime? Or for another reason? Otherwise, we'd need to make sure it isn't possible to setEFI_NX_PE_DATAon kexec.
Quoted 3 lines
arch/x86/platform/efi/efi.c | 1 + 1 file changed, 1 insertion(+)
Thanks.
I think we should just drop support for the EFI_PROPERTIES_TABLE - it was a failed, short-lived experiment that broke the boot on both Linux and Windows, and was replaced with the memory attributes table shortly after.
Quoted 15 lines
arch/x86/platform/efi/efi.c +1
-1@@ -784,6 +784,7 @@ static void __init kexec_enter_virtual_mode(void)efi_sync_low_kernel_mappings ();efi_native_runtime_setup (); +efi_runtime_update_mappings ();#endif } --2.40.1
Quoted 10 lines · Ard Biesheuvel
Quoted 8 lines · Nicolas Saenz Julienne
- Although care is taken to make sure the memory backing the EFI Memory Attributes table is preserved during runtime and reachable after kexec (see
efi_memattr_init()). I don't see the same happening for the EFI properties table. Maybe it's just unnecessary as there's an assumption that the table will fall in memory preserved during runtime? Or for another reason? Otherwise, we'd need to make sure it isn't possible to setEFI_NX_PE_DATAon kexec.
Quoted 6 lines
Thanks.
I think we should just drop support for the
EFI_PROPERTIES_TABLE- it was a failed, short-lived experiment that broke the boot on both Linux and Windows, and was replaced with the memory attributes table shortly after.
Isn't there a tiny posibility some platorm might be using the feature? Otherwise I'll send a v2 right away.
Nicolas