From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Jan Beulich <JBeulich@suse.com>
Subject: [PATCH RFC 04/31] xen/x86: Mask out unknown features from Xen's capabilities
Date: Wed, 16 Dec 2015 21:24:06 +0000 [thread overview]
Message-ID: <1450301073-28191-5-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1450301073-28191-1-git-send-email-andrew.cooper3@citrix.com>
If Xen doesn't know about a feature, it is unsafe for use and should be
deliberately hidden from Xen's capabilities.
This doesn't make a practical difference yet, but will make a difference
later when the guest featuresets are seeded from the host featureset.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
---
xen/arch/x86/cpu/common.c | 1 +
xen/arch/x86/cpuid/cpuid-private.h | 26 +++++++++
xen/arch/x86/cpuid/cpuid.c | 105 +++++++++++++++++++++++++++++++++++++
3 files changed, 132 insertions(+)
diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 3496b13..5bdb4b3 100644
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -324,6 +324,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
* we do "generic changes."
*/
for (i = 0; i < XEN_NR_FEATURESET_ENTRIES; ++i) {
+ c->x86_capability[i] &= known_features[i];
c->x86_capability[i] ^= inverted_features[i];
}
diff --git a/xen/arch/x86/cpuid/cpuid-private.h b/xen/arch/x86/cpuid/cpuid-private.h
index c8b47b3..a4d582c 100644
--- a/xen/arch/x86/cpuid/cpuid-private.h
+++ b/xen/arch/x86/cpuid/cpuid-private.h
@@ -10,6 +10,32 @@
#endif
+/* Mask of bits which are shared between 1d and e1d. */
+#define SHARED_1d \
+ (cpufeat_mask(X86_FEATURE_FPU) | \
+ cpufeat_mask(X86_FEATURE_VME) | \
+ cpufeat_mask(X86_FEATURE_DE) | \
+ cpufeat_mask(X86_FEATURE_PSE) | \
+ cpufeat_mask(X86_FEATURE_TSC) | \
+ cpufeat_mask(X86_FEATURE_MSR) | \
+ cpufeat_mask(X86_FEATURE_PAE) | \
+ cpufeat_mask(X86_FEATURE_MCE) | \
+ cpufeat_mask(X86_FEATURE_CX8) | \
+ cpufeat_mask(X86_FEATURE_APIC) | \
+ cpufeat_mask(X86_FEATURE_MTRR) | \
+ cpufeat_mask(X86_FEATURE_PGE) | \
+ cpufeat_mask(X86_FEATURE_MCA) | \
+ cpufeat_mask(X86_FEATURE_CMOV) | \
+ cpufeat_mask(X86_FEATURE_PAT) | \
+ cpufeat_mask(X86_FEATURE_PSE36) | \
+ cpufeat_mask(X86_FEATURE_MMX) | \
+ cpufeat_mask(X86_FEATURE_FXSR))
+
+/*
+ * Bitmap of features known to Xen.
+ */
+extern const uint32_t known_features[XEN_NR_FEATURESET_ENTRIES];
+
/*
* Bitmap of "anti" features which have their representation inverted when
* stored as a featureset.
diff --git a/xen/arch/x86/cpuid/cpuid.c b/xen/arch/x86/cpuid/cpuid.c
index 1578725..6ee9ce2 100644
--- a/xen/arch/x86/cpuid/cpuid.c
+++ b/xen/arch/x86/cpuid/cpuid.c
@@ -1,5 +1,110 @@
#include "cpuid-private.h"
+const uint32_t known_features[XEN_NR_FEATURESET_ENTRIES] =
+{
+ [cpufeat_word(X86_FEATURE_FPU)] = (SHARED_1d |
+ cpufeat_mask(X86_FEATURE_SEP) |
+ cpufeat_mask(X86_FEATURE_PN) |
+ cpufeat_mask(X86_FEATURE_CLFLSH) |
+ cpufeat_mask(X86_FEATURE_DS) |
+ cpufeat_mask(X86_FEATURE_ACPI) |
+ cpufeat_mask(X86_FEATURE_XMM) |
+ cpufeat_mask(X86_FEATURE_XMM2) |
+ cpufeat_mask(X86_FEATURE_SELFSNOOP) |
+ cpufeat_mask(X86_FEATURE_HT) |
+ cpufeat_mask(X86_FEATURE_ACC) |
+ cpufeat_mask(X86_FEATURE_IA64) |
+ cpufeat_mask(X86_FEATURE_PBE)),
+
+ [cpufeat_word(X86_FEATURE_XMM3)] = (cpufeat_mask(X86_FEATURE_XMM3) |
+ cpufeat_mask(X86_FEATURE_PCLMULQDQ) |
+ cpufeat_mask(X86_FEATURE_DTES64) |
+ cpufeat_mask(X86_FEATURE_MWAIT) |
+ cpufeat_mask(X86_FEATURE_DSCPL) |
+ cpufeat_mask(X86_FEATURE_VMXE) |
+ cpufeat_mask(X86_FEATURE_SMXE) |
+ cpufeat_mask(X86_FEATURE_EST) |
+ cpufeat_mask(X86_FEATURE_TM2) |
+ cpufeat_mask(X86_FEATURE_SSSE3) |
+ cpufeat_mask(X86_FEATURE_CID) |
+ cpufeat_mask(X86_FEATURE_FMA) |
+ cpufeat_mask(X86_FEATURE_CX16) |
+ cpufeat_mask(X86_FEATURE_XTPR) |
+ cpufeat_mask(X86_FEATURE_PDCM) |
+ cpufeat_mask(X86_FEATURE_PCID) |
+ cpufeat_mask(X86_FEATURE_DCA) |
+ cpufeat_mask(X86_FEATURE_SSE4_1) |
+ cpufeat_mask(X86_FEATURE_SSE4_2) |
+ cpufeat_mask(X86_FEATURE_X2APIC) |
+ cpufeat_mask(X86_FEATURE_MOVBE) |
+ cpufeat_mask(X86_FEATURE_POPCNT) |
+ cpufeat_mask(X86_FEATURE_TSC_DEADLINE) |
+ cpufeat_mask(X86_FEATURE_AES) |
+ cpufeat_mask(X86_FEATURE_XSAVE) |
+ cpufeat_mask(X86_FEATURE_OSXSAVE) |
+ cpufeat_mask(X86_FEATURE_AVX) |
+ cpufeat_mask(X86_FEATURE_F16C) |
+ cpufeat_mask(X86_FEATURE_RDRAND) |
+ cpufeat_mask(X86_FEATURE_HYPERVISOR)),
+
+ [cpufeat_word(X86_FEATURE_SYSCALL)] = (SHARED_1d |
+ cpufeat_mask(X86_FEATURE_SYSCALL) |
+ cpufeat_mask(X86_FEATURE_MP) |
+ cpufeat_mask(X86_FEATURE_NX) |
+ cpufeat_mask(X86_FEATURE_MMXEXT) |
+ cpufeat_mask(X86_FEATURE_FFXSR) |
+ cpufeat_mask(X86_FEATURE_PAGE1GB) |
+ cpufeat_mask(X86_FEATURE_RDTSCP) |
+ cpufeat_mask(X86_FEATURE_LM) |
+ cpufeat_mask(X86_FEATURE_3DNOWEXT) |
+ cpufeat_mask(X86_FEATURE_3DNOW)),
+
+ [cpufeat_word(X86_FEATURE_LAHF_LM)] = (cpufeat_mask(X86_FEATURE_LAHF_LM) |
+ cpufeat_mask(X86_FEATURE_CMP_LEGACY) |
+ cpufeat_mask(X86_FEATURE_SVM) |
+ cpufeat_mask(X86_FEATURE_EXTAPIC) |
+ cpufeat_mask(X86_FEATURE_CR8_LEGACY) |
+ cpufeat_mask(X86_FEATURE_ABM) |
+ cpufeat_mask(X86_FEATURE_SSE4A) |
+ cpufeat_mask(X86_FEATURE_MISALIGNSSE) |
+ cpufeat_mask(X86_FEATURE_3DNOWPREFETCH) |
+ cpufeat_mask(X86_FEATURE_OSVW) |
+ cpufeat_mask(X86_FEATURE_IBS) |
+ cpufeat_mask(X86_FEATURE_XOP) |
+ cpufeat_mask(X86_FEATURE_SKINIT) |
+ cpufeat_mask(X86_FEATURE_WDT) |
+ cpufeat_mask(X86_FEATURE_LWP) |
+ cpufeat_mask(X86_FEATURE_FMA4) |
+ cpufeat_mask(X86_FEATURE_NODEID_MSR) |
+ cpufeat_mask(X86_FEATURE_TBM) |
+ cpufeat_mask(X86_FEATURE_TOPOEXT) |
+ cpufeat_mask(X86_FEATURE_DBEXT) |
+ cpufeat_mask(X86_FEATURE_MWAITX)),
+
+ [cpufeat_word(X86_FEATURE_XSAVEOPT)] = (cpufeat_mask(X86_FEATURE_XSAVEOPT) |
+ cpufeat_mask(X86_FEATURE_XSAVEC) |
+ cpufeat_mask(X86_FEATURE_XGETBV1) |
+ cpufeat_mask(X86_FEATURE_XSAVES)),
+
+ [cpufeat_word(X86_FEATURE_FSGSBASE)] = (cpufeat_mask(X86_FEATURE_FSGSBASE) |
+ cpufeat_mask(X86_FEATURE_TSC_ADJUST) |
+ cpufeat_mask(X86_FEATURE_BMI1) |
+ cpufeat_mask(X86_FEATURE_HLE) |
+ cpufeat_mask(X86_FEATURE_AVX2) |
+ cpufeat_mask(X86_FEATURE_SMEP) |
+ cpufeat_mask(X86_FEATURE_BMI2) |
+ cpufeat_mask(X86_FEATURE_ERMS) |
+ cpufeat_mask(X86_FEATURE_INVPCID) |
+ cpufeat_mask(X86_FEATURE_RTM) |
+ cpufeat_mask(X86_FEATURE_CMT) |
+ cpufeat_mask(X86_FEATURE_FPU_SEL) |
+ cpufeat_mask(X86_FEATURE_MPX) |
+ cpufeat_mask(X86_FEATURE_CAT) |
+ cpufeat_mask(X86_FEATURE_RDSEED) |
+ cpufeat_mask(X86_FEATURE_ADX) |
+ cpufeat_mask(X86_FEATURE_SMAP)),
+};
+
const uint32_t inverted_features[XEN_NR_FEATURESET_ENTRIES] =
{
[cpufeat_word(X86_FEATURE_FPU_SEL)] = cpufeat_mask(X86_FEATURE_FPU_SEL),
--
2.1.4
next prev parent reply other threads:[~2015-12-16 21:24 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 21:24 [PATCH RFC 00/31] x86: Improvements to cpuid handling for guests Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 01/31] xen/public: Export featureset information in the public API Andrew Cooper
2015-12-22 16:28 ` Jan Beulich
2015-12-22 16:42 ` Andrew Cooper
2015-12-22 16:59 ` Jan Beulich
2015-12-23 10:05 ` Andrew Cooper
2015-12-23 10:24 ` Jan Beulich
2015-12-23 11:26 ` Andrew Cooper
2016-01-06 7:43 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 02/31] tools/libxc: Use public/featureset.h for cpuid policy generation Andrew Cooper
2015-12-22 16:29 ` Jan Beulich
2016-01-05 14:13 ` Ian Campbell
2016-01-05 14:17 ` Andrew Cooper
2016-01-05 14:18 ` Ian Campbell
2016-01-05 14:23 ` Andrew Cooper
2016-01-05 15:02 ` Ian Campbell
2016-01-05 15:42 ` Andrew Cooper
2016-01-05 16:09 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 03/31] xen/x86: Store antifeatures inverted in a featureset Andrew Cooper
2015-12-22 16:32 ` Jan Beulich
2015-12-22 17:03 ` Andrew Cooper
2016-01-05 14:19 ` Ian Campbell
2016-01-05 14:24 ` Andrew Cooper
2015-12-16 21:24 ` Andrew Cooper [this message]
2015-12-22 16:42 ` [PATCH RFC 04/31] xen/x86: Mask out unknown features from Xen's capabilities Jan Beulich
2015-12-22 17:01 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 05/31] xen/x86: Collect more CPUID feature words Andrew Cooper
2015-12-22 16:46 ` Jan Beulich
2015-12-22 17:17 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 06/31] xen/x86: Infrastructure to calculate guest featuresets Andrew Cooper
2015-12-22 16:50 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 07/31] xen/x86: Export host featureset via SYSCTL Andrew Cooper
2015-12-22 16:57 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 08/31] tools/stubs: Expose host featureset to userspace Andrew Cooper
2016-01-05 15:36 ` Ian Campbell
2016-01-05 15:59 ` Andrew Cooper
2016-01-05 16:09 ` Ian Campbell
2016-01-05 16:19 ` Andrew Cooper
2016-01-05 16:38 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 09/31] xen/x86: Calculate PV featureset Andrew Cooper
2015-12-22 17:07 ` Jan Beulich
2015-12-22 17:13 ` Andrew Cooper
2015-12-22 17:18 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 10/31] xen/x86: Calculate HVM featureset Andrew Cooper
2015-12-22 17:11 ` Jan Beulich
2015-12-22 17:21 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 11/31] xen/x86: Calculate Raw featureset Andrew Cooper
2015-12-22 17:14 ` Jan Beulich
2015-12-22 17:27 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 12/31] tools: Utility for dealing with featuresets Andrew Cooper
2016-01-05 15:17 ` Ian Campbell
2016-01-05 16:14 ` Andrew Cooper
2016-01-05 16:34 ` Ian Campbell
2016-01-05 17:13 ` Andrew Cooper
2016-01-05 17:37 ` Ian Campbell
2016-01-05 18:04 ` Andrew Cooper
2016-01-06 10:38 ` Ian Campbell
2016-01-06 10:40 ` Ian Campbell
2016-01-06 10:42 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 13/31] tools/libxc: Wire a featureset through to cpuid policy logic Andrew Cooper
2016-01-05 15:42 ` Ian Campbell
2016-01-05 16:20 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 14/31] tools/libxc: Use featureset rather than guesswork Andrew Cooper
2016-01-05 15:54 ` Ian Campbell
2016-01-05 16:22 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 15/31] x86: Generate deep dependencies of x86 features Andrew Cooper
2016-01-05 16:03 ` Ian Campbell
2016-01-05 16:42 ` Andrew Cooper
2016-01-05 16:54 ` Ian Campbell
2016-01-05 17:09 ` Andrew Cooper
2016-01-05 17:19 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 16/31] x86: Automatically generate known_features Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 17/31] xen/x86: Clear dependent features when clearing a cpu cap Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 18/31] xen/x86: Improve disabling of features which have dependencies Andrew Cooper
2016-01-21 16:48 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 19/31] tools/libxc: Sanitise guest featuresets Andrew Cooper
2016-01-05 16:05 ` Ian Campbell
2015-12-16 21:24 ` [PATCH RFC 20/31] x86: Improvements to in-hypervisor cpuid sanity checks Andrew Cooper
2016-01-21 17:02 ` Jan Beulich
2016-01-21 17:21 ` Andrew Cooper
2016-01-21 18:15 ` Andrew Cooper
2016-01-22 7:47 ` Jan Beulich
2016-01-22 7:45 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 21/31] x86/domctl: Break out logic to update domain state from cpuid information Andrew Cooper
2016-01-21 17:05 ` Jan Beulich
2016-01-21 17:08 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 22/31] x86/cpu: Move set_cpumask() calls into c_early_init() Andrew Cooper
2016-01-21 17:08 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 23/31] xen/x86: Export cpuid levelling capabilities via SYSCTL Andrew Cooper
2016-01-21 17:23 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 24/31] tools/stubs: Expose host levelling capabilities to userspace Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 25/31] xen/x86: Common infrastructure for levelling context switching Andrew Cooper
2016-01-22 8:56 ` Jan Beulich
2016-01-22 10:05 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 26/31] xen/x86: Rework AMD masking MSR setup Andrew Cooper
2016-01-22 9:27 ` Jan Beulich
2016-01-22 11:01 ` Andrew Cooper
2016-01-22 11:13 ` Jan Beulich
2016-01-22 13:59 ` Andrew Cooper
2016-01-22 14:12 ` Jan Beulich
2016-01-22 17:03 ` Andrew Cooper
2016-01-25 11:25 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 27/31] xen/x86: Rework Intel masking/faulting setup Andrew Cooper
2016-01-22 9:40 ` Jan Beulich
2016-01-22 14:09 ` Andrew Cooper
2016-01-22 14:29 ` Jan Beulich
2016-01-22 14:46 ` Andrew Cooper
2016-01-22 14:53 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 28/31] xen/x86: Context switch all levelling state in context_switch() Andrew Cooper
2016-01-22 9:52 ` Jan Beulich
2016-01-22 14:19 ` Andrew Cooper
2016-01-22 14:31 ` Jan Beulich
2016-01-22 14:39 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 29/31] x86/pv: Provide custom cpumasks for PV domains Andrew Cooper
2016-01-22 9:56 ` Jan Beulich
2016-01-22 14:24 ` Andrew Cooper
2016-01-22 14:33 ` Jan Beulich
2016-01-22 14:42 ` Andrew Cooper
2016-01-22 14:48 ` Jan Beulich
2016-01-22 14:56 ` Andrew Cooper
2015-12-16 21:24 ` [PATCH RFC 30/31] x86/domctl: Update PV domain cpumasks when setting cpuid policy Andrew Cooper
2016-01-22 10:02 ` Jan Beulich
2015-12-16 21:24 ` [PATCH RFC 31/31] tools/libxc: Calculate xstate cpuid leaf from guest information Andrew Cooper
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=1450301073-28191-5-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=xen-devel@lists.xen.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;
as well as URLs for NNTP newsgroup(s).