5 files changed, 30 insertions, 13 deletions

diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h
index c43b4ac13008..f4e524b67e91 100644
--- a/arch/arm64/include/asm/fpsimd.h
+++ b/arch/arm64/include/asm/fpsimd.h
@@ -58,6 +58,9 @@ extern void fpsimd_load_state(struct fpsimd_state *state);
 extern void fpsimd_thread_switch(struct task_struct *next);
 extern void fpsimd_flush_thread(void);
 
+extern void fpsimd_preserve_current_state(void);
+extern void fpsimd_update_current_state(struct fpsimd_state *state);
+
 #endif
 
 #endif
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 4aef42a04bdc..8a97163debc7 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -87,6 +87,26 @@ void fpsimd_flush_thread(void)
         preempt_enable();
 }
 
+/*
+ * Save the userland FPSIMD state of 'current' to memory
+ */
+void fpsimd_preserve_current_state(void)
+{
+        preempt_disable();
+        fpsimd_save_state(&current->thread.fpsimd_state);
+        preempt_enable();
+}
+
+/*
+ * Load an updated userland FPSIMD state for 'current' from memory
+ */
+void fpsimd_update_current_state(struct fpsimd_state *state)
+{
+        preempt_disable();
+        fpsimd_load_state(state);
+        preempt_enable();
+}
+
 #ifdef CONFIG_KERNEL_MODE_NEON
 
 /*
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 6391485f342d..c5693163408c 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -205,7 +205,7 @@ void release_thread(struct task_struct *dead_task)
 
 int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
 {
-        fpsimd_save_state(&current->thread.fpsimd_state);
+        fpsimd_preserve_current_state();
         *dst = *src;
         return 0;
 }
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index 890a591f75dd..06448a77ff53 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -51,7 +51,7 @@ static int preserve_fpsimd_context(struct fpsimd_context __user *ctx)
         int err;
 
         /* dump the hardware registers to the fpsimd_state structure */
-        fpsimd_save_state(fpsimd);
+        fpsimd_preserve_current_state();
 
         /* copy the FP and status/control registers */
         err = __copy_to_user(ctx->vregs, fpsimd->vregs, sizeof(fpsimd->vregs));
@@ -86,11 +86,8 @@ static int restore_fpsimd_context(struct fpsimd_context __user *ctx)
         __get_user_error(fpsimd.fpcr, &ctx->fpcr, err);
 
         /* load the hardware registers from the fpsimd_state structure */
-        if (!err) {
-                preempt_disable();
-                fpsimd_load_state(&fpsimd);
-                preempt_enable();
-        }
+        if (!err)
+                fpsimd_update_current_state(&fpsimd);
 
         return err ? -EFAULT : 0;
 }
diff --git a/arch/arm64/kernel/signal32.c b/arch/arm64/kernel/signal32.c
index b3fc9f5ec6d3..ac7e237d0bda 100644
--- a/arch/arm64/kernel/signal32.c
+++ b/arch/arm64/kernel/signal32.c
@@ -219,7 +219,7 @@ static int compat_preserve_vfp_context(struct compat_vfp_sigframe __user *frame)
          * Note that this also saves V16-31, which aren't visible
          * in AArch32.
          */
-        fpsimd_save_state(fpsimd);
+        fpsimd_preserve_current_state();
 
         /* Place structure header on the stack */
         __put_user_error(magic, &frame->magic, err);
@@ -282,11 +282,8 @@ static int compat_restore_vfp_context(struct compat_vfp_sigframe __user *frame)
          * We don't need to touch the exception register, so
          * reload the hardware state.
          */
-        if (!err) {
-                preempt_disable();
-                fpsimd_load_state(&fpsimd);
-                preempt_enable();
-        }
+        if (!err)
+                fpsimd_update_current_state(&fpsimd);
 
         return err ? -EFAULT : 0;
 }