From patchwork Wed Mar 23 16:36:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8651471 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 606D1C0553 for ; Wed, 23 Mar 2016 16:39:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4ADB5203AB for ; Wed, 23 Mar 2016 16:39:08 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 48D9D203EB for ; Wed, 23 Mar 2016 16:39:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aillw-0001wm-LB; Wed, 23 Mar 2016 16:36:40 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aillv-0001uK-Iv for xen-devel@lists.xen.org; Wed, 23 Mar 2016 16:36:39 +0000 Received: from [85.158.143.35] by server-2.bemta-6.messagelabs.com id EC/0D-09532-616C2F65; Wed, 23 Mar 2016 16:36:38 +0000 X-Env-Sender: prvs=883e14dc5=Andrew.Cooper3@citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1458750992!5533013!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61329 invoked from network); 23 Mar 2016 16:36:38 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-4.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 23 Mar 2016 16:36:38 -0000 X-IronPort-AV: E=Sophos;i="5.24,383,1454976000"; d="scan'208";a="348174879" From: Andrew Cooper To: Xen-devel Date: Wed, 23 Mar 2016 16:36:07 +0000 Message-ID: <1458750989-28967-5-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458750989-28967-1-git-send-email-andrew.cooper3@citrix.com> References: <1458750989-28967-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Andrew Cooper Subject: [Xen-devel] [PATCH v4 04/26] xen/x86: Mask out unknown features from Xen's capabilities X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk --- v2: * Reduced substantially from v1, by using the autogenerated information. v3: * Drop redundant braces. --- xen/arch/x86/Makefile | 1 + xen/arch/x86/cpu/common.c | 2 ++ xen/arch/x86/cpuid.c | 20 ++++++++++++++++++++ xen/include/asm-x86/cpufeature.h | 4 +--- xen/include/asm-x86/cpuid.h | 25 +++++++++++++++++++++++++ xen/tools/gen-cpuid.py | 24 ++++++++++++++++++++++++ 6 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 xen/arch/x86/cpuid.c create mode 100644 xen/include/asm-x86/cpuid.h diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 1bcb08b..729065b 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -12,6 +12,7 @@ obj-y += bitops.o obj-bin-y += bzimage.init.o obj-bin-y += clear_page.o obj-bin-y += copy_page.o +obj-y += cpuid.o obj-y += compat.o x86_64/compat.o obj-$(CONFIG_KEXEC) += crash.o obj-y += debug.o diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 1a278b1..d302272 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -341,6 +341,8 @@ void identify_cpu(struct cpuinfo_x86 *c) * The vendor-specific functions might have changed features. Now * we do "generic changes." */ + for (i = 0; i < FSCAPINTS; ++i) + c->x86_capability[i] &= known_features[i]; for (i = 0 ; i < NCAPINTS ; ++i) c->x86_capability[i] &= ~cleared_caps[i]; diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c new file mode 100644 index 0000000..05cd646 --- /dev/null +++ b/xen/arch/x86/cpuid.c @@ -0,0 +1,20 @@ +#include +#include +#include + +const uint32_t known_features[] = INIT_KNOWN_FEATURES; + +static void __init __maybe_unused build_assertions(void) +{ + BUILD_BUG_ON(ARRAY_SIZE(known_features) != FSCAPINTS); +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index bcda09b..e29b024 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -10,10 +10,8 @@ #endif #include -#include -#include +#include -#define FSCAPINTS FEATURESET_NR_ENTRIES #define NCAPINTS (FSCAPINTS + 1) /* N 32-bit words worth of info */ /* Other features, Xen-defined mapping. */ diff --git a/xen/include/asm-x86/cpuid.h b/xen/include/asm-x86/cpuid.h new file mode 100644 index 0000000..b72d88f --- /dev/null +++ b/xen/include/asm-x86/cpuid.h @@ -0,0 +1,25 @@ +#ifndef __X86_CPUID_H__ +#define __X86_CPUID_H__ + +#include +#include + +#define FSCAPINTS FEATURESET_NR_ENTRIES + +#ifndef __ASSEMBLY__ +#include + +extern const uint32_t known_features[FSCAPINTS]; + +#endif /* __ASSEMBLY__ */ +#endif /* !__X86_CPUID_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index c6bd98d..44b4c98 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -19,6 +19,8 @@ class State(object): # State calculated self.nr_entries = 0 # Number of words in a featureset + self.common_1d = 0 # Common features between 1d and e1d + self.known = [] # All known features def parse_definitions(state): """ @@ -95,6 +97,22 @@ def crunch_numbers(state): # Size of bitmaps state.nr_entries = nr_entries = (max(state.names.keys()) >> 5) + 1 + # Features common between 1d and e1d. + common_1d = (FPU, VME, DE, PSE, TSC, MSR, PAE, MCE, CX8, APIC, + MTRR, PGE, MCA, CMOV, PAT, PSE36, MMX, FXSR) + + # All known features. Duplicate the common features in e1d + e1d_base = SYSCALL & ~31 + state.known = featureset_to_uint32s( + state.names.keys() + [ e1d_base + (x % 32) for x in common_1d ], + nr_entries) + + # Fold common back into names + for f in common_1d: + state.names[e1d_base + (f % 32)] = "E1D_" + state.names[f] + + state.common_1d = featureset_to_uint32s(common_1d, 1)[0] + def write_results(state): state.output.write( @@ -109,7 +127,13 @@ def write_results(state): state.output.write( """ #define FEATURESET_NR_ENTRIES %sU + +#define CPUID_COMMON_1D_FEATURES %s + +#define INIT_KNOWN_FEATURES { \\\n%s\n} """ % (state.nr_entries, + state.common_1d, + format_uint32s(state.known, 4), )) state.output.write(