efi: Allocate runtime workqueue before ACPI init
PATCH 1/1 efi: Allocate runtime workqueue before ACPI init
From: Ard Biesheuvel <[email protected]>
Since commit
5894cf571e14 ("acpi/prmt: Use EFI runtime sandbox to invoke PRM handlers")
ACPI PRM calls are delegated to a workqueue which runs in a kernel thread, making it easier to detect and mitigate faulting memory accesses performed by the firmware.
Rafael reports that such PRM accesses may occur before efisubsys_init() executes, which is where the workqueue is allocated, leading to NULL pointer dereferences. Since acpi_init() [which triggers the early PRM accesses] executes as a subsys_initcall() as well, and has its own dependencies that may be sensitive to initcall ordering, deferring acpi_init() is not an option.
So instead, split off the workqueue allocation into its own postcore initcall, as this is the only missing piece to allow EFI runtime calls to be made. This ensures that EFI runtime call (including PRM calls) are accessible to all code running at subsys_initcall() level.
--- drivers/firmware/efi/efi.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/firmware/efi/efi.c +16 -12
@@ -402,21 +402,11 @@ static void __init efi_debugfs_init(void)static inline void efi_debugfs_init (void ) {}#endif -/* -* We register the efi subsystem with the firmware subsystem and the -* efivars subsystem with the efi subsystem, if the system was booted with -* EFI. -*/ -static int __init efisubsys_init (void ) +static int __init efipostcore_init (void ) { -int error; -if (!efi_enabled (EFI_RUNTIME_SERVICES )) efi.runtime_supported_mask =0 ; -if (!efi_enabled (EFI_BOOT )) -return 0 ; -if (efi.runtime_supported_mask) {/* * Since we process only one efi_runtime_service() at a time, an
@@ -428,9 +418,23 @@ static int __init efisubsys_init(void)pr_err ("Creating efi_rts_wq failed, EFI runtime services disabled.\n" );clear_bit (EFI_RUNTIME_SERVICES , &efi.flags); efi.runtime_supported_mask =0 ; -return 0 ; } } +return 0 ; +} +postcore_initcall (efipostcore_init); + +/* +* We register the efi subsystem with the firmware subsystem and the +* efivars subsystem with the efi subsystem, if the system was booted with +* EFI. +*/ +static int __init efisubsys_init (void ) +{ +int error; + +if (!efi_enabled (EFI_BOOT )) +return 0 ;if (efi_rt_services_supported (EFI_RT_SUPPORTED_TIME_SERVICES ))platform_device_register_simple ("rtc-efi" ,0 ,NULL ,0 );
Signature · 1 line
2.54.0.563.g4f69b47b94-goog
Quoted 18 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
Since commit
5894cf571e14("acpi/prmt: Use EFI runtime sandbox to invoke PRM handlers")ACPI PRM calls are delegated to a workqueue which runs in a kernel thread, making it easier to detect and mitigate faulting memory accesses performed by the firmware.
Rafael reports that such PRM accesses may occur before
efisubsys_init()executes, which is where the workqueue is allocated, leading to NULL pointer dereferences. Sinceacpi_init()[which triggers the early PRM accesses] executes as asubsys_initcall()as well, and has its own dependencies that may be sensitive to initcall ordering, deferringacpi_init()is not an option.
Quoted 8 lines
So instead, split off the workqueue allocation into its own postcore initcall, as this is the only missing piece to allow EFI runtime calls to be made. This ensures that EFI runtime call (including PRM calls) are accessible to all code running at
subsys_initcall()level.Fixes 5894cf571e14 ("acpi/prmt: Use EFI runtime sandbox to invoke PRM handlers")Reported-by "Rafael J. Wysocki" <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>
This should work AFAICS, so
Quoted 57 lines
--- drivers/firmware/efi/efi.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)drivers/firmware/efi/efi.c +16
-13@@ -402,21 +402,11 @@ static void __init efi_debugfs_init(void)static inline void efi_debugfs_init (void ) {}#endif -/* -* We register the efi subsystem with the firmware subsystem and the -* efivars subsystem with the efi subsystem, if the system was booted with -* EFI. -*/ -static int __init efisubsys_init (void ) +static int __init efipostcore_init (void ) { -int error; -if (!efi_enabled (EFI_RUNTIME_SERVICES )) efi.runtime_supported_mask =0 ; -if (!efi_enabled (EFI_BOOT )) -return 0 ; -if (efi.runtime_supported_mask) {/* * Since we process only one efi_runtime_service() at a time, an @@ -428,9 +418,23 @@ static int __init efisubsys_init(void)pr_err ("Creating efi_rts_wq failed, EFI runtime services disabled.\n" );clear_bit (EFI_RUNTIME_SERVICES , &efi.flags); efi.runtime_supported_mask =0 ; -return 0 ; } } +return 0 ; +} +postcore_initcall (efipostcore_init); + +/* +* We register the efi subsystem with the firmware subsystem and the +* efivars subsystem with the efi subsystem, if the system was booted with +* EFI. +*/ +static int __init efisubsys_init (void ) +{ +int error; + +if (!efi_enabled (EFI_BOOT )) +return 0 ;if (efi_rt_services_supported (EFI_RT_SUPPORTED_TIME_SERVICES ))platform_device_register_simple ("rtc-efi" ,0 ,NULL ,0 ); --
Ard Biesheuvel
maintainerQuoted 24 lines · Rafael J. Wysocki
Quoted 23 lines · Ard Biesheuvel
From: Ard Biesheuvel <[email protected]>
Since commit
5894cf571e14("acpi/prmt: Use EFI runtime sandbox to invoke PRM handlers")ACPI PRM calls are delegated to a workqueue which runs in a kernel thread, making it easier to detect and mitigate faulting memory accesses performed by the firmware.
Rafael reports that such PRM accesses may occur before
efisubsys_init()executes, which is where the workqueue is allocated, leading to NULL pointer dereferences. Sinceacpi_init()[which triggers the early PRM accesses] executes as asubsys_initcall()as well, and has its own dependencies that may be sensitive to initcall ordering, deferringacpi_init()is not an option.So instead, split off the workqueue allocation into its own postcore initcall, as this is the only missing piece to allow EFI runtime calls to be made. This ensures that EFI runtime call (including PRM calls) are accessible to all code running at
subsys_initcall()level.
Quoted 8 lines
Quoted 3 lines
Fixes 5894cf571e14 ("acpi/prmt: Use EFI runtime sandbox to invoke PRM handlers")Reported-by "Rafael J. Wysocki" <[email protected]>Signed-off-by Ard Biesheuvel <[email protected]>This should work AFAICS, so
Reviewed-by Rafael J. Wysocki (Intel) <[email protected]>
OK, I'll queue this up.