Skip to content

Commit 7137a20

Browse files
ardbiesheuvelctmarinas
authored andcommitted
arm64/fpsimd: Permit kernel mode NEON with IRQs off
Currently, may_use_simd() will return false when called from a context where IRQs are disabled. One notable case where this happens is when calling the ResetSystem() EFI runtime service from the reboot/poweroff code path. For this case alone, there is a substantial amount of FP/SIMD support code to handle the corner case where a EFI runtime service is invoked with IRQs disabled. The only reason kernel mode SIMD is not allowed when IRQs are disabled is that re-enabling softirqs in this case produces a noisy diagnostic when lockdep is enabled. The warning is valid, in the sense that delivering pending softirqs over the back of the call to local_bh_enable() is problematic when IRQs are disabled. While the API lacks a facility to simply mask and unmask softirqs without triggering their delivery, disabling softirqs is not needed to begin with when IRQs are disabled, given that softirqs are only every taken asynchronously over the back of a hard IRQ. So dis/enable softirq processing conditionally, based on whether IRQs are enabled, and relax the check in may_use_simd(). 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 1d038e8 commit 7137a20

2 files changed

Lines changed: 20 additions & 7 deletions

File tree

arch/arm64/include/asm/simd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ static __must_check inline bool may_use_simd(void)
2929
*/
3030
return !WARN_ON(!system_capabilities_finalized()) &&
3131
system_supports_fpsimd() &&
32-
!in_hardirq() && !irqs_disabled() && !in_nmi();
32+
!in_hardirq() && !in_nmi();
3333
}
3434

3535
#else /* ! CONFIG_KERNEL_MODE_NEON */

arch/arm64/kernel/fpsimd.c

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,21 @@ static void fpsimd_bind_task_to_cpu(void);
225225
*/
226226
static void get_cpu_fpsimd_context(void)
227227
{
228-
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
229-
local_bh_disable();
230-
else
228+
if (!IS_ENABLED(CONFIG_PREEMPT_RT)) {
229+
/*
230+
* The softirq subsystem lacks a true unmask/mask API, and
231+
* re-enabling softirq processing using local_bh_enable() will
232+
* not only unmask softirqs, it will also result in immediate
233+
* delivery of any pending softirqs.
234+
* This is undesirable when running with IRQs disabled, but in
235+
* that case, there is no need to mask softirqs in the first
236+
* place, so only bother doing so when IRQs are enabled.
237+
*/
238+
if (!irqs_disabled())
239+
local_bh_disable();
240+
} else {
231241
preempt_disable();
242+
}
232243
}
233244

234245
/*
@@ -240,10 +251,12 @@ static void get_cpu_fpsimd_context(void)
240251
*/
241252
static void put_cpu_fpsimd_context(void)
242253
{
243-
if (!IS_ENABLED(CONFIG_PREEMPT_RT))
244-
local_bh_enable();
245-
else
254+
if (!IS_ENABLED(CONFIG_PREEMPT_RT)) {
255+
if (!irqs_disabled())
256+
local_bh_enable();
257+
} else {
246258
preempt_enable();
259+
}
247260
}
248261

249262
unsigned int task_get_vl(const struct task_struct *task, enum vec_type type)

0 commit comments

Comments
 (0)