* [PATCH] x86/pkeys: make protection keys an "eager" feature
@ 2016-10-07 16:23 Dave Hansen
2016-10-08 10:30 ` [tip:x86/urgent] x86/pkeys: Make " tip-bot for Dave Hansen
0 siblings, 1 reply; 2+ messages in thread
From: Dave Hansen @ 2016-10-07 16:23 UTC (permalink / raw)
To: linux-kernel; +Cc: Dave Hansen, dave.hansen, stable, x86
From: Dave Hansen <dave.hansen@intel.com>
Our XSAVE features are divided into two categories: those that
generate FPU exceptions, and those that do not. MPX and pkeys do
not generate FPU exceptions and thus can not be used lazily. We
disable them when lazy mode is forced on.
We have a pair of masks to collect these two sets of features, but
XFEATURE_MASK_PKRU was added to the wrong mask: XFEATURE_MASK_LAZY.
Fix it by moving the feature to XFEATURE_MASK_EAGER.
Note: this only causes problem if you boot with lazy FPU mode
(eagerfpu=off) which is *not* the default. It also only affects
hardware which is not currently publicly available. It looks like
eager mode is going away, but we still need this patch applied
to any kernel that has protection keys and lazy mode, which is 4.6
through 4.8 at this point, and 4.9 if the lazy removal isn't sent
to Linus for 4.9.
Signed-off-by: Dave Hansen <dave.hansen@intel.com>
Fixes: c8df40098451 ("x86/fpu, x86/mm/pkeys: Add PKRU xsave fields and data structures")
Cc: <stable@vger.kernel.org> # v4.6+
Cc: x86@kernel.org
---
b/arch/x86/include/asm/fpu/xstate.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff -puN arch/x86/include/asm/fpu/xstate.h~x86-pkeys-add-as-eager-feature arch/x86/include/asm/fpu/xstate.h
--- a/arch/x86/include/asm/fpu/xstate.h~x86-pkeys-add-as-eager-feature 2016-10-07 08:54:17.363165294 -0700
+++ b/arch/x86/include/asm/fpu/xstate.h 2016-10-07 08:54:17.366165429 -0700
@@ -27,11 +27,12 @@
XFEATURE_MASK_YMM | \
XFEATURE_MASK_OPMASK | \
XFEATURE_MASK_ZMM_Hi256 | \
- XFEATURE_MASK_Hi16_ZMM | \
- XFEATURE_MASK_PKRU)
+ XFEATURE_MASK_Hi16_ZMM)
/* Supported features which require eager state saving */
-#define XFEATURE_MASK_EAGER (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR)
+#define XFEATURE_MASK_EAGER (XFEATURE_MASK_BNDREGS | \
+ XFEATURE_MASK_BNDCSR | \
+ XFEATURE_MASK_PKRU)
/* All currently supported features */
#define XCNTXT_MASK (XFEATURE_MASK_LAZY | XFEATURE_MASK_EAGER)
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/urgent] x86/pkeys: Make protection keys an "eager" feature
2016-10-07 16:23 [PATCH] x86/pkeys: make protection keys an "eager" feature Dave Hansen
@ 2016-10-08 10:30 ` tip-bot for Dave Hansen
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Dave Hansen @ 2016-10-08 10:30 UTC (permalink / raw)
To: linux-tip-commits; +Cc: mingo, hpa, linux-kernel, dave.hansen, dave, tglx
Commit-ID: d4b05923f579c234137317cdf9a5eb69ddab76d1
Gitweb: http://git.kernel.org/tip/d4b05923f579c234137317cdf9a5eb69ddab76d1
Author: Dave Hansen <dave.hansen@intel.com>
AuthorDate: Fri, 7 Oct 2016 09:23:42 -0700
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 8 Oct 2016 12:26:44 +0200
x86/pkeys: Make protection keys an "eager" feature
Our XSAVE features are divided into two categories: those that
generate FPU exceptions, and those that do not. MPX and pkeys do
not generate FPU exceptions and thus can not be used lazily. We
disable them when lazy mode is forced on.
We have a pair of masks to collect these two sets of features, but
XFEATURE_MASK_PKRU was added to the wrong mask: XFEATURE_MASK_LAZY.
Fix it by moving the feature to XFEATURE_MASK_EAGER.
Note: this only causes problem if you boot with lazy FPU mode
(eagerfpu=off) which is *not* the default. It also only affects
hardware which is not currently publicly available. It looks like
eager mode is going away, but we still need this patch applied
to any kernel that has protection keys and lazy mode, which is 4.6
through 4.8 at this point, and 4.9 if the lazy removal isn't sent
to Linus for 4.9.
Fixes: c8df40098451 ("x86/fpu, x86/mm/pkeys: Add PKRU xsave fields and data structures")
Signed-off-by: Dave Hansen <dave.hansen@intel.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/20161007162342.28A49813@viggo.jf.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/fpu/xstate.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/fpu/xstate.h b/arch/x86/include/asm/fpu/xstate.h
index d4957ac..430bacf 100644
--- a/arch/x86/include/asm/fpu/xstate.h
+++ b/arch/x86/include/asm/fpu/xstate.h
@@ -27,11 +27,12 @@
XFEATURE_MASK_YMM | \
XFEATURE_MASK_OPMASK | \
XFEATURE_MASK_ZMM_Hi256 | \
- XFEATURE_MASK_Hi16_ZMM | \
- XFEATURE_MASK_PKRU)
+ XFEATURE_MASK_Hi16_ZMM)
/* Supported features which require eager state saving */
-#define XFEATURE_MASK_EAGER (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR)
+#define XFEATURE_MASK_EAGER (XFEATURE_MASK_BNDREGS | \
+ XFEATURE_MASK_BNDCSR | \
+ XFEATURE_MASK_PKRU)
/* All currently supported features */
#define XCNTXT_MASK (XFEATURE_MASK_LAZY | XFEATURE_MASK_EAGER)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-08 10:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-07 16:23 [PATCH] x86/pkeys: make protection keys an "eager" feature Dave Hansen
2016-10-08 10:30 ` [tip:x86/urgent] x86/pkeys: Make " tip-bot for Dave Hansen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).