arm64/fpsimd: Load FP state based on recorded data type

Now that we are recording the type of floating point register state we
are saving when we write the register state out to memory we can use
that information when we load from memory to decide which format to
load, bringing TIF_SVE into line with what we saved rather than relying
on TIF_SVE to determine what to load.

The SME state details are already recorded directly in the saved
SVCR and handled based on the information there.

Since we are not changing any of the save paths there should be no
functional change from this patch, further patches will make use of this
to optimise and clarify the code.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221115094640.112848-6-broonie@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 3041e55b15810695f3127b6d0faded8502325325..eb42b00dce54ee3d466e31f754367b119c24a909 100644 (file)
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -395,11 +395,37 @@ static void task_fpsimd_load(void)
        WARN_ON(!system_supports_fpsimd());
        WARN_ON(!have_cpu_fpsimd_context());
 
-       /* Check if we should restore SVE first */
-       if (IS_ENABLED(CONFIG_ARM64_SVE) && test_thread_flag(TIF_SVE)) {
-               sve_set_vq(sve_vq_from_vl(task_get_sve_vl(current)) - 1);
-               restore_sve_regs = true;
-               restore_ffr = true;
+       if (system_supports_sve()) {
+               switch (current->thread.fp_type) {
+               case FP_STATE_FPSIMD:
+                       /* Stop tracking SVE for this task until next use. */
+                       if (test_and_clear_thread_flag(TIF_SVE))
+                               sve_user_disable();
+                       break;
+               case FP_STATE_SVE:
+                       if (!thread_sm_enabled(&current->thread) &&
+                           !WARN_ON_ONCE(!test_and_set_thread_flag(TIF_SVE)))
+                               sve_user_enable();
+
+                       if (test_thread_flag(TIF_SVE))
+                               sve_set_vq(sve_vq_from_vl(task_get_sve_vl(current)) - 1);
+
+                       restore_sve_regs = true;
+                       restore_ffr = true;
+                       break;
+               default:
+                       /*
+                        * This indicates either a bug in
+                        * fpsimd_save() or memory corruption, we
+                        * should always record an explicit format
+                        * when we save. We always at least have the
+                        * memory allocated for FPSMID registers so
+                        * try that and hope for the best.
+                        */
+                       WARN_ON_ONCE(1);
+                       clear_thread_flag(TIF_SVE);
+                       break;
+               }
        }
 
        /* Restore SME, override SVE register configuration if needed */
@@ -415,10 +441,8 @@ static void task_fpsimd_load(void)
                if (thread_za_enabled(&current->thread))
                        za_load_state(current->thread.za_state);
 
-               if (thread_sm_enabled(&current->thread)) {
-                       restore_sve_regs = true;
+               if (thread_sm_enabled(&current->thread))
                        restore_ffr = system_supports_fa64();
-               }
        }
 
        if (restore_sve_regs) {