Skip to content

Commit a5baf58

Browse files
ardbiesheuvelctmarinas
authored andcommitted
arm64/efi: Call EFI runtime services without disabling preemption
The only remaining reason why EFI runtime services are invoked with preemption disabled is the fact that the mm is swapped out behind the back of the context switching code. The kernel no longer disables preemption in kernel_neon_begin(). Furthermore, the EFI spec is being clarified to explicitly state that only baseline FP/SIMD is permitted in EFI runtime service implementations, and so the existing kernel mode NEON context switching code is sufficient to preserve and restore the execution context of an in-progress EFI runtime service call. Most EFI calls are made from the efi_rts_wq, which is serviced by a kthread. As kthreads never return to user space, they usually don't have an mm, and so we can use the existing infrastructure to swap in the efi_mm while the EFI call is in progress. This is visible to the scheduler, which will therefore reactivate the selected mm when switching out the kthread and back in again. Given that the EFI spec explicitly permits runtime services to be called with interrupts enabled, firmware code is already required to tolerate interruptions. So rather than disable preemption, disable only migration so that EFI runtime services are less likely to cause scheduling delays. To avoid potential issues where runtime services are interrupted while polling the secure firmware for async completions, keep migration disabled so that a runtime service invocation does not resume on a different CPU from the one it was started on. Note, though, that the firmware executes at the same privilege level as the kernel, and is therefore able to disable interrupts altogether. Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 6b9c98e commit a5baf58

1 file changed

Lines changed: 21 additions & 2 deletions

File tree

arch/arm64/kernel/efi.c

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/efi.h>
1111
#include <linux/init.h>
1212
#include <linux/kmemleak.h>
13+
#include <linux/kthread.h>
1314
#include <linux/screen_info.h>
1415
#include <linux/vmalloc.h>
1516

@@ -168,7 +169,20 @@ asmlinkage efi_status_t efi_handle_corrupted_x18(efi_status_t s, const char *f)
168169
void arch_efi_call_virt_setup(void)
169170
{
170171
efi_runtime_assert_lock_held();
171-
efi_virtmap_load();
172+
173+
if (preemptible() && (current->flags & PF_KTHREAD)) {
174+
/*
175+
* Disable migration to ensure that a preempted EFI runtime
176+
* service call will be resumed on the same CPU. This avoids
177+
* potential issues with EFI runtime calls that are preempted
178+
* while polling for an asynchronous completion of a secure
179+
* firmware call, which may not permit the CPU to change.
180+
*/
181+
migrate_disable();
182+
kthread_use_mm(&efi_mm);
183+
} else {
184+
efi_virtmap_load();
185+
}
172186

173187
/*
174188
* Enable access to the valid TTBR0_EL1 and invoke the errata
@@ -193,7 +207,12 @@ void arch_efi_call_virt_teardown(void)
193207
*/
194208
uaccess_ttbr0_disable();
195209

196-
efi_virtmap_unload();
210+
if (preemptible() && (current->flags & PF_KTHREAD)) {
211+
kthread_unuse_mm(&efi_mm);
212+
migrate_enable();
213+
} else {
214+
efi_virtmap_unload();
215+
}
197216
}
198217

199218
asmlinkage u64 *efi_rt_stack_top __ro_after_init;

0 commit comments

Comments
 (0)