Skip to content

Commit e5fa85f

Browse files
brooniectmarinas
authored andcommitted
arm64/fpsimd: Don't corrupt FPMR when streaming mode changes
When the effective value of PSTATE.SM is changed from 0 to 1 or from 1 to 0 by any method, an entry or exit to/from streaming SVE mode is performed, and hardware automatically resets a number of registers. As of ARM DDI 0487 L.a, this means: * All implemented bits of the SVE vector registers are set to zero. * All implemented bits of the SVE predicate registers are set to zero. * All implemented bits of FFR are set to zero, if FFR is implemented in the new mode. * FPSR is set to 0x0000_0000_0800_009f. * FPMR is set to 0, if FPMR is implemented. Currently task_fpsimd_load() restores FPMR before restoring SVCR (which is an accessor for PSTATE.{SM,ZA}), and so the restored value of FPMR may be clobbered if the restored value of PSTATE.SM happens to differ from the initial value of PSTATE.SM. Fix this by moving the restore of FPMR later. Note: this was originally posted as [1]. Fixes: 203f2b9 ("arm64/fpsimd: Support FEAT_FPMR") Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/linux-arm-kernel/20241204-arm64-sme-reenable-v2-2-bae87728251d@kernel.org/ [ Rutland: rewrite commit message ] Signed-off-by: Mark Rutland <mark.rutland@arm.com> Link: https://lore.kernel.org/r/20250409164010.3480271-7-mark.rutland@arm.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent d3eaab3 commit e5fa85f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/arm64/kernel/fpsimd.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,6 @@ static void task_fpsimd_load(void)
359359
WARN_ON(preemptible());
360360
WARN_ON(test_thread_flag(TIF_KERNEL_FPSTATE));
361361

362-
if (system_supports_fpmr())
363-
write_sysreg_s(current->thread.uw.fpmr, SYS_FPMR);
364-
365362
if (system_supports_sve() || system_supports_sme()) {
366363
switch (current->thread.fp_type) {
367364
case FP_STATE_FPSIMD:
@@ -411,6 +408,9 @@ static void task_fpsimd_load(void)
411408
restore_ffr = system_supports_fa64();
412409
}
413410

411+
if (system_supports_fpmr())
412+
write_sysreg_s(current->thread.uw.fpmr, SYS_FPMR);
413+
414414
if (restore_sve_regs) {
415415
WARN_ON_ONCE(current->thread.fp_type != FP_STATE_SVE);
416416
sve_load_state(sve_pffr(&current->thread),

0 commit comments

Comments
 (0)