Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1440743

[tip:x86/fpu] x86/fpu/xstate: Fix fpstate_init() for XRSTORS

Show all headers | View raw

Commit-ID:  35ac2d7ba787eb4b7418a5a6f5919c25e10a780a
Gitweb:     http://git.kernel.org/tip/35ac2d7ba787eb4b7418a5a6f5919c25e10a780a
Author:     Yu-cheng Yu <yu-cheng.yu@intel.com>
AuthorDate: Mon, 11 Jul 2016 09:18:56 -0700
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Mon, 11 Jul 2016 16:44:00 +0200

x86/fpu/xstate: Fix fpstate_init() for XRSTORS

In XSAVES mode if fpstate_init() is used to initialize a
task's extended state area, xsave.header.xcomp_bv[63] must
be set. Otherwise, when the task is scheduled, a warning is
triggered from copy_kernel_to_xregs().

One such test case is: setting an invalid extended state
through PTRACE. When xstateregs_set() rejects the syscall
and re-initializes the task's extended state area. This triggers
the warning mentioned above.

Signed-off-by: Yu-cheng Yu <yu-cheng.yu@intel.com>
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Reviewed-by: Dave Hansen <dave.hansen@intel.com>
Cc: H. Peter Anvin <h.peter.anvin@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi V Shankar <ravi.v.shankar@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1468253937-40008-4-git-send-email-fenghua.yu@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/include/asm/fpu/types.h | 6 ++++++
 arch/x86/kernel/fpu/core.c       | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/arch/x86/include/asm/fpu/types.h b/arch/x86/include/asm/fpu/types.h
index 12dd648..48df486 100644
--- a/arch/x86/include/asm/fpu/types.h
+++ b/arch/x86/include/asm/fpu/types.h
@@ -232,6 +232,12 @@ struct xstate_header {
 } __attribute__((packed));
 
 /*
+ * xstate_header.xcomp_bv[63] indicates that the extended_state_area
+ * is in compacted format.
+ */
+#define XCOMP_BV_COMPACTED_FORMAT ((u64)1 << 63)
+
+/*
  * This is our most modern FPU state format, as saved by the XSAVE
  * and restored by the XRSTOR instructions.
  *
diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index c759bd0..3fc03a0 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -8,6 +8,7 @@
 #include <asm/fpu/internal.h>
 #include <asm/fpu/regset.h>
 #include <asm/fpu/signal.h>
+#include <asm/fpu/types.h>
 #include <asm/traps.h>
 
 #include <linux/hardirq.h>
@@ -229,6 +230,13 @@ void fpstate_init(union fpregs_state *state)
 
 	memset(state, 0, fpu_kernel_xstate_size);
 
+	/*
+	 * XRSTORS requires that this bit is set in xcomp_bv, or
+	 * it will #GP. Make sure it is replaced after the memset().
+	 */
+	if (static_cpu_has(X86_FEATURE_XSAVES))
+		state->xsave.header.xcomp_bv = XCOMP_BV_COMPACTED_FORMAT;
+
 	if (static_cpu_has(X86_FEATURE_FXSR))
 		fpstate_init_fxstate(&state->fxsave);
 	else

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] x86/fpu/xstate: Fix XSAVES issues - Part 3 "Fenghua Yu" <fenghua.yu@intel.com> - 2016-07-11 15:20 +0200
  [PATCH 1/4] x86/fpu/xstate: Fix __fpu_restore_sig() for XSAVES "Fenghua Yu" <fenghua.yu@intel.com> - 2016-07-11 15:20 +0200
    [tip:x86/fpu] x86/fpu/xstate: Fix __fpu_restore_sig() for XSAVES tip-bot for Yu-cheng Yu <tipbot@zytor.com> - 2016-07-11 18:20 +0200
  [PATCH 2/4] x86/fpu/xstate: Return NULL for disabled xstate component address "Fenghua Yu" <fenghua.yu@intel.com> - 2016-07-11 15:20 +0200
    [tip:x86/fpu] x86/fpu/xstate: Return NULL for disabled xstate  component address tip-bot for Yu-cheng Yu <tipbot@zytor.com> - 2016-07-11 18:20 +0200
  [PATCH 3/4] x86/fpu/xstate: Fix fpstate_init() for XRSTORS "Fenghua Yu" <fenghua.yu@intel.com> - 2016-07-11 15:20 +0200
    [tip:x86/fpu] x86/fpu/xstate: Fix fpstate_init() for XRSTORS tip-bot for Yu-cheng Yu <tipbot@zytor.com> - 2016-07-11 18:20 +0200

csiph-web