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 16/31] x86: Automatically generate known_features
Date: Wed, 16 Dec 2015 21:24:18 +0000 [thread overview]
Message-ID: <1450301073-28191-17-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1450301073-28191-1-git-send-email-andrew.cooper3@citrix.com>
Use the new gen-feature-deps.py infrastructure to automatically generate
known_features[], rather than requiring people to patch two places to add a
new feature for hypervisor use.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
TODO: Probably move the introduction of gen-feature-deps.py earier in the
series, so "xen/x86: Mask out unknown features from Xen's capabilities" uses
the automatically generated known_features[].
---
xen/arch/x86/cpuid/cpuid.c | 115 ---------------------------------
xen/arch/x86/cpuid/gen-feature-deps.py | 23 ++++++-
2 files changed, 20 insertions(+), 118 deletions(-)
diff --git a/xen/arch/x86/cpuid/cpuid.c b/xen/arch/x86/cpuid/cpuid.c
index 20c36f7..c1f3e22 100644
--- a/xen/arch/x86/cpuid/cpuid.c
+++ b/xen/arch/x86/cpuid/cpuid.c
@@ -1,120 +1,5 @@
#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) |
- cpufeat_mask(X86_FEATURE_PCOMMIT) |
- cpufeat_mask(X86_FEATURE_CLFLUSHOPT) |
- cpufeat_mask(X86_FEATURE_CLWB) |
- cpufeat_mask(X86_FEATURE_SHA)),
-
- [cpufeat_word(X86_FEATURE_PREFETCHWT1)] = (cpufeat_mask(X86_FEATURE_PREFETCHWT1)),
-
- [cpufeat_word(X86_FEATURE_ITSC)] = (cpufeat_mask(X86_FEATURE_ITSC)),
-
- [cpufeat_word(X86_FEATURE_CLZERO)] = (cpufeat_mask(X86_FEATURE_CLZERO)),
-};
-
const uint32_t inverted_features[XEN_NR_FEATURESET_ENTRIES] =
{
[cpufeat_word(X86_FEATURE_FPU_SEL)] = cpufeat_mask(X86_FEATURE_FPU_SEL),
diff --git a/xen/arch/x86/cpuid/gen-feature-deps.py b/xen/arch/x86/cpuid/gen-feature-deps.py
index f0ecbba..1b61542 100755
--- a/xen/arch/x86/cpuid/gen-feature-deps.py
+++ b/xen/arch/x86/cpuid/gen-feature-deps.py
@@ -42,6 +42,15 @@ with open(path.join(os.environ["XEN_ROOT"],
# Construct a reverse mapping of value to name
names[val] = name
+# Features shared between 1d and e1d.
+shared_1d = (FPU, VME, DE, PSE, TSC, MSR, PAE, MCE, CX8, APIC,
+ MTRR, PGE, MCA, CMOV, PAT, PSE36, MMX, FXSR)
+
+# All defined features, other than shared ones.
+all_features = []
+
+for f in (x for x in names.keys() if not x in shared_1d):
+ all_features.append(f)
# Dependences specified as a dictionary of tuples: The feature in the key
# is a direct dependency of each of the features in the tuple.
@@ -95,7 +104,7 @@ for feat in deep_features:
deep_deps[feat] = seen[1:]
-def format_featurset(fs):
+def format_featurset(fs, shared = False):
words = {}
res = "\n"
@@ -112,7 +121,11 @@ def format_featurset(fs):
for w in sorted(words.keys()):
wf = sorted(words[w])
- res += " [cpufeat_word(X86_FEATURE_%s)] = (\n" % (names[wf[0]], )
+ if shared and wf[0] in (SEP, SYSCALL):
+ res += " [cpufeat_word(X86_FEATURE_%s)] = (SHARED_1d |\n" \
+ % (names[wf[0]], )
+ else:
+ res += " [cpufeat_word(X86_FEATURE_%s)] = (\n" % (names[wf[0]], )
res += " |\n".join(
" cpufeat_mask(X86_FEATURE_%s)" %
@@ -130,8 +143,12 @@ with open(path.join(os.environ["XEN_ROOT"],
*/
#include "cpuid-private.h"
+const uint32_t known_features[XEN_NR_FEATURESET_ENTRIES] =
+{%s
+};
+
const struct tagged_featureset deep_deps[] =
-{""" % (sys.argv[0],))
+{""" % (sys.argv[0], format_featurset(all_features, True)))
for d in sorted(deep_deps.keys()):
f.write("""
--
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 ` [PATCH RFC 04/31] xen/x86: Mask out unknown features from Xen's capabilities Andrew Cooper
2015-12-22 16:42 ` 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 ` Andrew Cooper [this message]
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-17-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).