From patchwork Wed Mar 23 16:36:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8652321 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A30E49F36E for ; Wed, 23 Mar 2016 17:03:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6B5D203B0 for ; Wed, 23 Mar 2016 17:03:12 +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 BEE302035E for ; Wed, 23 Mar 2016 17:03:11 +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 1aim9I-00066b-FB; Wed, 23 Mar 2016 17:00:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1aim9H-00065T-Be for xen-devel@lists.xen.org; Wed, 23 Mar 2016 17:00:47 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 2B/69-03651-EBBC2F65; Wed, 23 Mar 2016 17:00:46 +0000 X-Env-Sender: prvs=883e14dc5=Andrew.Cooper3@citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1458752444!14386314!1 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 40560 invoked from network); 23 Mar 2016 17:00:45 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 23 Mar 2016 17:00:45 -0000 X-IronPort-AV: E=Sophos;i="5.24,383,1454976000"; d="scan'208";a="348182197" From: Andrew Cooper To: Xen-devel Date: Wed, 23 Mar 2016 16:36:25 +0000 Message-ID: <1458750989-28967-23-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: MIA1 Cc: Andrew Cooper , Ian Jackson Subject: [Xen-devel] [PATCH v4 22/26] tools/libxc: Expose the automatically generated cpu featuremask information 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 Signed-off-by: Andrew Cooper Acked-by: Wei Liu Reviewed-by: Konrad Rzeszutek Wilk --- CC: Ian Jackson New in v2 --- tools/libxc/Makefile | 9 ++++++ tools/libxc/include/xenctrl.h | 14 ++++++++ tools/libxc/xc_cpuid_x86.c | 75 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 608404f..ef02c9d 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -145,6 +145,15 @@ $(eval $(genpath-target)) xc_private.h: _paths.h +ifeq ($(CONFIG_X86),y) + +_xc_cpuid_autogen.h: $(XEN_ROOT)/xen/include/public/arch-x86/cpufeatureset.h $(XEN_ROOT)/xen/tools/gen-cpuid.py + $(PYTHON) $(XEN_ROOT)/xen/tools/gen-cpuid.py -i $^ -o $@.new + $(call move-if-changed,$@.new,$@) + +build: _xc_cpuid_autogen.h +endif + $(CTRL_LIB_OBJS) $(GUEST_LIB_OBJS) \ $(CTRL_PIC_OBJS) $(GUEST_PIC_OBJS): xc_private.h diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index c136aa8..66acbd1 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2533,6 +2533,20 @@ int xc_psr_cat_get_l3_info(xc_interface *xch, uint32_t socket, int xc_get_cpu_levelling_caps(xc_interface *xch, uint32_t *caps); int xc_get_cpu_featureset(xc_interface *xch, uint32_t index, uint32_t *nr_features, uint32_t *featureset); + +uint32_t xc_get_cpu_featureset_size(void); + +enum xc_static_cpu_featuremask { + XC_FEATUREMASK_KNOWN, + XC_FEATUREMASK_SPECIAL, + XC_FEATUREMASK_PV, + XC_FEATUREMASK_HVM_SHADOW, + XC_FEATUREMASK_HVM_HAP, + XC_FEATUREMASK_DEEP_FEATURES, +}; +const uint32_t *xc_get_static_cpu_featuremask(enum xc_static_cpu_featuremask); +const uint32_t *xc_get_feature_deep_deps(uint32_t feature); + #endif /* Compat shims */ diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index d3674db..0cffb36 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -28,6 +28,7 @@ enum { #define XEN_CPUFEATURE(name, value) X86_FEATURE_##name = value, #include }; +#include "_xc_cpuid_autogen.h" #define bitmaskof(idx) (1u << ((idx) & 31)) #define clear_bit(idx, dst) ((dst) &= ~bitmaskof(idx)) @@ -78,6 +79,80 @@ int xc_get_cpu_featureset(xc_interface *xch, uint32_t index, return ret; } +uint32_t xc_get_cpu_featureset_size(void) +{ + return FEATURESET_NR_ENTRIES; +} + +const uint32_t *xc_get_static_cpu_featuremask( + enum xc_static_cpu_featuremask mask) +{ + const static uint32_t known[FEATURESET_NR_ENTRIES] = INIT_KNOWN_FEATURES, + special[FEATURESET_NR_ENTRIES] = INIT_SPECIAL_FEATURES, + pv[FEATURESET_NR_ENTRIES] = INIT_PV_FEATURES, + hvm_shadow[FEATURESET_NR_ENTRIES] = INIT_HVM_SHADOW_FEATURES, + hvm_hap[FEATURESET_NR_ENTRIES] = INIT_HVM_HAP_FEATURES, + deep_features[FEATURESET_NR_ENTRIES] = INIT_DEEP_FEATURES; + + XC_BUILD_BUG_ON(ARRAY_SIZE(known) != FEATURESET_NR_ENTRIES); + XC_BUILD_BUG_ON(ARRAY_SIZE(special) != FEATURESET_NR_ENTRIES); + XC_BUILD_BUG_ON(ARRAY_SIZE(pv) != FEATURESET_NR_ENTRIES); + XC_BUILD_BUG_ON(ARRAY_SIZE(hvm_shadow) != FEATURESET_NR_ENTRIES); + XC_BUILD_BUG_ON(ARRAY_SIZE(hvm_hap) != FEATURESET_NR_ENTRIES); + XC_BUILD_BUG_ON(ARRAY_SIZE(deep_features) != FEATURESET_NR_ENTRIES); + + switch ( mask ) + { + case XC_FEATUREMASK_KNOWN: + return known; + + case XC_FEATUREMASK_SPECIAL: + return special; + + case XC_FEATUREMASK_PV: + return pv; + + case XC_FEATUREMASK_HVM_SHADOW: + return hvm_shadow; + + case XC_FEATUREMASK_HVM_HAP: + return hvm_hap; + + case XC_FEATUREMASK_DEEP_FEATURES: + return deep_features; + + default: + return NULL; + } +} + +const uint32_t *xc_get_feature_deep_deps(uint32_t feature) +{ + static const struct { + uint32_t feature; + uint32_t fs[FEATURESET_NR_ENTRIES]; + } deep_deps[] = INIT_DEEP_DEPS; + + unsigned int start = 0, end = ARRAY_SIZE(deep_deps); + + XC_BUILD_BUG_ON(ARRAY_SIZE(deep_deps) != NR_DEEP_DEPS); + + /* deep_deps[] is sorted. Perform a binary search. */ + while ( start < end ) + { + unsigned int mid = start + ((end - start) / 2); + + if ( deep_deps[mid].feature > feature ) + end = mid; + else if ( deep_deps[mid].feature < feature ) + start = mid + 1; + else + return deep_deps[mid].fs; + } + + return NULL; +} + struct cpuid_domain_info { enum