From patchwork Wed Mar 22 15:28:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 9639229 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 81134601E9 for ; Wed, 22 Mar 2017 15:31:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 732E32521E for ; Wed, 22 Mar 2017 15:31:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67FED2845C; Wed, 22 Mar 2017 15:31:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id C57592521E for ; Wed, 22 Mar 2017 15:31:20 +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 1cqiC6-0004nq-OB; Wed, 22 Mar 2017 15:29:02 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cqiC5-0004my-Nz for xen-devel@lists.xenproject.org; Wed, 22 Mar 2017 15:29:01 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id C7/A4-15112-D3892D85; Wed, 22 Mar 2017 15:29:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEIsWRWlGSWpSXmKPExsXitHSDva7NjEs RBgsnqlp83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlN7xMLujUrTvffZW1g/KTQxcjJISHgL7H1 +XUmEJtNQEdi6tNLrF2MHBwiAioSt/cagJjMAuUSHRNqQSqEBcIlni9sYwQJswioSvw74QoS5 hVwl7i8v5EVYqCcxPnjP5lBbE4BD4kvL5+CxYWAar7/uMAEYatIrJ86iw2iV1Di5MwnLCA2s4 CExMEXL5gnMPLOQpKahSS1gJFpFaN6cWpRWWqRrrFeUlFmekZJbmJmjq6hgZlebmpxcWJ6ak5 iUrFecn7uJkZgyDAAwQ7Gjn9OhxglOZiURHnLf5yIEOJLyk+pzEgszogvKs1JLT7EKMPBoSTB +1ThZISQYFFqempFWmYOMHhh0hIcPEoivEdA0rzFBYm5xZnpEKlTjMYcc2bvfsPEcathzxsmI Za8/LxUKXHekyClAiClGaV5cINgUXWJUVZKmJcR6DQhnoLUotzMElT5V4ziHIxKwrxXQabwZO aVwO17BXQKE9Apbz+cADmlJBEhJdXAePDkjkkVf1um7PupbHa/YsIMudVV7ee3uPS0rihd8Ot U0sl1WbPWPLqbcOHm2q0KmpO7J3++x76/k3u7gm7CLO3yuDD7na7yYssrM55YcLwR9TNKdz9b FHZmz8f/13yPRk8r0fJtWv6Zf9Oyw/O0ZrswLlaOE+Jj+7D0gkbK8+hLHVFOt39ud1FiKc5IN NRiLipOBABqcluapQIAAA== X-Env-Sender: prvs=2479a8bc7=Paul.Durrant@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1490196537!63707145!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: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55792 invoked from network); 22 Mar 2017 15:29:00 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 22 Mar 2017 15:29:00 -0000 X-IronPort-AV: E=Sophos;i="5.36,205,1486425600"; d="scan'208";a="424212422" From: Paul Durrant To: Date: Wed, 22 Mar 2017 15:28:07 +0000 Message-ID: <1490196489-16021-2-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490196489-16021-1-git-send-email-paul.durrant@citrix.com> References: <1490196489-16021-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Paul Durrant , Jan Beulich Subject: [Xen-devel] [PATCH v5 1/3] x86/viridian: don't put Xen version information in CPUID leaf 2 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-Virus-Scanned: ClamAV using ClamSMTP The Hypervisor Top Level Functional Specification v5.0a states in section 2.5: "The hypervisor version information is encoded in leaf 0x40000002. Two version numbers are provided: the main version and the service version. The main version includes a major and minor version number and a build number. These correspond to Microsoft Windows release numbers." It also goes on to advise clients (i.e. guest versions of Windows) to use the following algorithm to determine compatibility with the hypervisor enlightenments: if greater than { your version is compatible } else if equal to and greater than or equal to { your version is compatible } else { your version is NOT compatible } So, clearly putting Xen hypervisor version information in that leaf is spurious, but we probably get away with it because Xen's major version is lower than the major version of Windows in which Hyper-V first appeared (Server 2008). This patch changes the leaf to use the kernel major and minor versions, and build number from Windows Server 2008 (64-bit) by default. These default values can be overriden from the Xen command line using new 'viridian-version' parameter. Signed-off-by: Paul Durrant Reviewed-by: Jan Beulich --- Cc: Jan Beulich Cc: Andrew Cooper v5: - Re-work code as per Jan's suggestion - Fix label indentation v4: - Make elements of viridian-version parameter optional - Use custom_param() - Constify a pointer v3: - Use a combined version parameter v2: - Use full version information (including build number) from Windows Server 2008 - Add command line parameters to allow version information to be overridden --- docs/misc/xen-command-line.markdown | 8 ++++++ xen/arch/x86/hvm/viridian.c | 56 +++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index bad20db..c81d693 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1616,6 +1616,14 @@ The optional `keep` parameter causes Xen to continue using the vga console even after dom0 has been started. The default behaviour is to relinquish control to dom0. +### viridian-version +> `= [],[],[]` + +> Default: `6,0,0x1772` + +, and must be integers. The values will be +encoded in guest CPUID 0x40000002 if viridian enlightenments are enabled. + ### vpid (Intel) > `= ` diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index b740224..d59294f 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -164,6 +164,16 @@ typedef struct { #define CPUID6A_MSR_BITMAPS (1 << 1) #define CPUID6A_NESTED_PAGING (1 << 3) +/* + * Version and build number reported by CPUID leaf 2 + * + * These numbers are chosen to match the version numbers reported by + * Windows Server 2008. + */ +static uint16_t __read_mostly viridian_major = 6; +static uint16_t __read_mostly viridian_minor = 0; +static uint32_t __read_mostly viridian_build = 0x1772; + void cpuid_viridian_leaves(const struct vcpu *v, uint32_t leaf, uint32_t subleaf, struct cpuid_leaf *res) { @@ -194,8 +204,8 @@ void cpuid_viridian_leaves(const struct vcpu *v, uint32_t leaf, own version number. */ if ( d->arch.hvm_domain.viridian.guest_os_id.raw == 0 ) break; - res->a = 1; /* Build number */ - res->b = (xen_major_version() << 16) | xen_minor_version(); + res->a = viridian_build; + res->b = ((uint32_t)viridian_major << 16) | viridian_minor; res->c = 0; /* SP */ res->d = 0; /* Service branch and number */ break; @@ -990,6 +1000,48 @@ static int viridian_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) HVM_REGISTER_SAVE_RESTORE(VIRIDIAN_VCPU, viridian_save_vcpu_ctxt, viridian_load_vcpu_ctxt, 1, HVMSR_PER_VCPU); +static void __init parse_viridian_version(char *arg) +{ + const char *t; + unsigned int n[3]; + unsigned int i = 0; + + n[0] = viridian_major; + n[1] = viridian_minor; + n[2] = viridian_build; + + while ( (t = strsep(&arg, ",")) != NULL ) + { + const char *e; + + if ( *t == '\0' ) + continue; + + n[i++] = simple_strtoul(t, &e, 0); + if ( *e != '\0' ) + goto fail; + } + if ( i != 3 ) + goto fail; + + if ( ((typeof(viridian_major))n[0] != n[0]) || + ((typeof(viridian_minor))n[1] != n[1]) || + ((typeof(viridian_build))n[2] != n[2]) ) + goto fail; + + viridian_major = n[0]; + viridian_minor = n[1]; + viridian_build = n[2]; + + printk("viridian-version = %#x,%#x,%#x\n", + viridian_major, viridian_minor, viridian_build); + return; + + fail: + printk(XENLOG_WARNING "Invalid viridian-version, using default\n"); +} +custom_param("viridian-version", parse_viridian_version); + /* * Local variables: * mode: C