From: Rik van Riel <riel@xxxxxxxxxxx>
The FPU registers need only to be saved if TIF_NEED_FPU_LOAD is not set.
Otherwise this has been already done and can be skipped.
Signed-off-by: Rik van Riel <riel@xxxxxxxxxxx>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx>
---
arch/x86/kernel/fpu/signal.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
index 254a8dff9cd82..179e2b19976ad 100644
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@ -156,11 +156,20 @@ int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
sizeof(struct user_i387_ia32_struct), NULL,
(struct _fpstate_32 __user *) buf) ? -1 : 1;
- /* Update the thread's fxstate to save the fsave header. */
- if (ia32_fxstate)
- copy_fxregs_to_kernel(fpu);
- else
- copy_fpregs_to_fpstate(fpu);
+ __fpregs_changes_begin();
+ /*
+ * If we do not need to load the FPU registers at return to userspace
+ * then the CPU has the current state and we need to save it. Otherwise
+ * it is already done and we can skip it.
+ */
+ if (!test_thread_flag(TIF_NEED_FPU_LOAD)) {
+ /* Update the thread's fxstate to save the fsave header. */
+ if (ia32_fxstate)
+ copy_fxregs_to_kernel(fpu);
+ else
+ copy_fpregs_to_fpstate(fpu);
+ }
+ __fpregs_changes_end();
if (using_compacted_format()) {
copy_xstate_to_user(buf_fx, xsave, 0, size);
--
2.19.1
