From: Yu-cheng Yu <yu-cheng.yu@intel.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>,
Andy Lutomirski <luto@kernel.org>, Borislav Petkov <bp@suse.de>,
Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>,
"Ravi V. Shankar" <ravi.v.shankar@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
Yu-cheng Yu <yu-cheng.yu@intel.com>
Subject: [PATCH v6 12/13] x86/xsaves: Fix fpstate_init() for XRSTORS
Date: Tue, 10 May 2016 16:30:04 -0700 [thread overview]
Message-ID: <d95643d30ce6e9bff7d699d8be4d2b62be423171.1462914897.git.yu-cheng.yu@intel.com> (raw)
In-Reply-To: <cover.1462914897.git.yu-cheng.yu@intel.com>
In-Reply-To: <cover.1462914897.git.yu-cheng.yu@intel.com>
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>
---
arch/x86/include/asm/fpu/types.h | 6 ++++++
arch/x86/kernel/fpu/core.c | 4 ++++
2 files changed, 10 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 dfd29ac..9ed096f 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>
@@ -224,6 +225,9 @@ void fpstate_init(union fpregs_state *state)
memset(state, 0, fpu_kernel_xstate_size);
+ if (cpu_has_xsaves)
+ state->xsave.header.xcomp_bv = XCOMP_BV_COMPACTED_FORMAT;
+
if (cpu_has_fxsr)
fpstate_init_fxstate(&state->fxsave);
else
--
1.9.1
next prev parent reply other threads:[~2016-05-10 23:34 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 23:29 [PATCH v6 00/13] x86/xsaves: Fix XSAVES issues Yu-cheng Yu
2016-05-10 23:29 ` [PATCH v6 01/13] x86/xsaves: Define and use fpu_user_xstate_size Yu-cheng Yu
2016-05-11 17:20 ` Borislav Petkov
2016-05-11 17:25 ` Yu, Fenghua
2016-05-11 17:32 ` Borislav Petkov
2016-05-12 6:35 ` Ingo Molnar
2016-05-10 23:29 ` [PATCH v6 02/13] x86/xsaves: Rename xstate_size to fpu_kernel_xstate_size to distinguish from fpu_user_xstate_size Yu-cheng Yu
2016-05-10 23:29 ` [PATCH v6 03/13] x86/xsaves: Keep init_fpstate.xsave.header.xfeatures as zero for init optimization Yu-cheng Yu
2016-05-10 23:29 ` [PATCH v6 04/13] x86/xsaves: Introduce a new check that allows correct xstates copy from kernel to user directly Yu-cheng Yu
2016-05-10 23:29 ` [PATCH v6 05/13] x86/xsaves: Align xstate components according to CPUID Yu-cheng Yu
2016-05-10 23:29 ` [PATCH v6 06/13] x86/xsaves: Supervisor state component offset Yu-cheng Yu
2016-05-10 23:29 ` [PATCH v6 07/13] x86/xsaves: Fix PTRACE frames for XSAVES Yu-cheng Yu
2016-05-11 14:50 ` Dave Hansen
2016-05-11 15:16 ` Ingo Molnar
2016-05-10 23:30 ` [PATCH v6 08/13] x86/xsaves: Fix XSTATE component offset print out Yu-cheng Yu
2016-05-10 23:30 ` [PATCH v6 09/13] x86/xsaves: Fix xstate_offsets, xstate_sizes for non-extended states Yu-cheng Yu
2016-05-10 23:30 ` [PATCH v6 10/13] x86/xsaves: Fix __fpu_restore_sig() for XSAVES Yu-cheng Yu
2016-05-10 23:30 ` [PATCH v6 11/13] x86/xsaves: When a disabled xstate component offset is requested, return NULL Yu-cheng Yu
2016-05-10 23:30 ` Yu-cheng Yu [this message]
2016-05-10 23:30 ` [PATCH v6 13/13] x86/xsaves: Re-enable XSAVES Yu-cheng Yu
2016-05-11 4:17 ` [PATCH v6 00/13] x86/xsaves: Fix XSAVES issues Borislav Petkov
2016-05-11 20:03 ` Yu-cheng Yu
2016-05-11 20:12 ` Borislav Petkov
2016-05-12 6:41 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d95643d30ce6e9bff7d699d8be4d2b62be423171.1462914897.git.yu-cheng.yu@intel.com \
--to=yu-cheng.yu@intel.com \
--cc=bp@suse.de \
--cc=dave.hansen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=ravi.v.shankar@intel.com \
--cc=sai.praneeth.prakhya@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®