From patchwork Wed Jan 4 12:39:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9496671 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 0A134606B5 for ; Wed, 4 Jan 2017 12:48:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F083B27F85 for ; Wed, 4 Jan 2017 12:48:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E570927F8C; Wed, 4 Jan 2017 12:48:24 +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 8490027F85 for ; Wed, 4 Jan 2017 12:48:24 +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 1cOkxb-0005f4-BG; Wed, 04 Jan 2017 12:46:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cOkxZ-0005cD-Lv for xen-devel@lists.xen.org; Wed, 04 Jan 2017 12:46:29 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id BF/14-16730-4AEEC685; Wed, 04 Jan 2017 12:46:28 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42JxWrohUnfJu5w Ig59rBC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1ozD1zexFpyWrZj69wZLA+MC0S5GTg4JAX+J U7eXMoPYbAL6ErtffGICsUUE1CVOd1xk7WLk4mAWmMUo8XrXDxaQhLBAikTHl5vsXYwcHCwCK hKzp9SBhHkFPCV6LjxlhpgpJ3H++E8wmxMo/mzjOkYQW0jAQ2LKxWXsELaaxLX+S+wQvYISJ2 c+ARvPLCAhcfDFC+YJjLyzkKRmIUktYGRaxahenFpUllqka6KXVJSZnlGSm5iZo2toYKyXm1p cnJiempOYVKyXnJ+7iREYOgxAsIOx8YvTIUZJDiYlUd6+9pwIIb6k/JTKjMTijPii0pzU4kOM MhwcShK8Qm+BcoJFqempFWmZOcAghklLcPAoifCmg6R5iwsSc4sz0yFSpxgVpcR5jUESAiCJj NI8uDZY5FxilJUS5mUEOkSIpyC1KDezBFX+FaM4B6OSMK8NyBSezLwSuOmvgBYzAS3eHpANsr gkESEl1cDoVPKt6b3PpIQG8b9ld9rm/kloatu6RnDlbMv6A973JltnbjDc9zPuzZPbYgvb2pa +iuS5Hrt+R7Jij4KKKttkyaOyvT4CAitWL/rQ/MA4JeZ8ebt82XUG3z+6tlPK58mu+SSq1RUb 4/17+/r7bHHMnUvm+8105vkbl/NS5/TzM+ab70/rCSpQYinOSDTUYi4qTgQAnZgRQJcCAAA= X-Env-Sender: prvs=1701003ad=Andrew.Cooper3@citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1483533980!52605894!6 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46515 invoked from network); 4 Jan 2017 12:46:27 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-6.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 4 Jan 2017 12:46:27 -0000 X-IronPort-AV: E=Sophos;i="5.33,459,1477958400"; d="scan'208";a="397866980" From: Andrew Cooper To: Xen-devel Date: Wed, 4 Jan 2017 12:39:30 +0000 Message-ID: <1483533584-8015-14-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1483533584-8015-1-git-send-email-andrew.cooper3@citrix.com> References: <1483533584-8015-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: Andrew Cooper , Kevin Tian , Jun Nakajima , Jan Beulich Subject: [Xen-devel] [PATCH 13/27] x86/vvmx: Use hvm_cr4_guest_valid_bits() to calculate MSR_IA32_VMX_CR4_FIXED1 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 Reuse the logic in hvm_cr4_guest_valid_bits() instead of duplicating it. This fixes a bug to do with the handling of X86_CR4_PCE. The RDPMC instruction predate the architectural performance feature, and has been around since the P6. X86_CR4_PCE is like X86_CR4_TSD and only controls whether RDPMC is available at cpl!=0, not whether RDPMC is generally unavailable. Signed-off-by: Andrew Cooper Acked-by: Kevin Tian Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Jun Nakajima CC: Kevin Tian --- xen/arch/x86/hvm/vmx/vvmx.c | 58 +++------------------------------------------ 1 file changed, 3 insertions(+), 55 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index d53c576..0a298c7 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1849,16 +1849,12 @@ int nvmx_handle_invvpid(struct cpu_user_regs *regs) int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) { struct vcpu *v = current; - unsigned int eax, ebx, ecx, edx; + struct domain *d = v->domain; u64 data = 0, host_data = 0; int r = 1; - if ( !nestedhvm_enabled(v->domain) ) - return 0; - /* VMX capablity MSRs are available only when guest supports VMX. */ - hvm_cpuid(0x1, NULL, NULL, &ecx, &edx); - if ( !(ecx & cpufeat_mask(X86_FEATURE_VMX)) ) + if ( !nestedhvm_enabled(d) || !d->arch.cpuid->basic.vmx ) return 0; /* @@ -2004,55 +2000,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) data = X86_CR4_VMXE; break; case MSR_IA32_VMX_CR4_FIXED1: - if ( edx & cpufeat_mask(X86_FEATURE_VME) ) - data |= X86_CR4_VME | X86_CR4_PVI; - if ( edx & cpufeat_mask(X86_FEATURE_TSC) ) - data |= X86_CR4_TSD; - if ( edx & cpufeat_mask(X86_FEATURE_DE) ) - data |= X86_CR4_DE; - if ( edx & cpufeat_mask(X86_FEATURE_PSE) ) - data |= X86_CR4_PSE; - if ( edx & cpufeat_mask(X86_FEATURE_PAE) ) - data |= X86_CR4_PAE; - if ( edx & cpufeat_mask(X86_FEATURE_MCE) ) - data |= X86_CR4_MCE; - if ( edx & cpufeat_mask(X86_FEATURE_PGE) ) - data |= X86_CR4_PGE; - if ( edx & cpufeat_mask(X86_FEATURE_FXSR) ) - data |= X86_CR4_OSFXSR; - if ( edx & cpufeat_mask(X86_FEATURE_SSE) ) - data |= X86_CR4_OSXMMEXCPT; - if ( ecx & cpufeat_mask(X86_FEATURE_VMX) ) - data |= X86_CR4_VMXE; - if ( ecx & cpufeat_mask(X86_FEATURE_SMX) ) - data |= X86_CR4_SMXE; - if ( ecx & cpufeat_mask(X86_FEATURE_PCID) ) - data |= X86_CR4_PCIDE; - if ( ecx & cpufeat_mask(X86_FEATURE_XSAVE) ) - data |= X86_CR4_OSXSAVE; - - hvm_cpuid(0x0, &eax, NULL, NULL, NULL); - switch ( eax ) - { - default: - hvm_cpuid(0xa, &eax, NULL, NULL, NULL); - /* Check whether guest has the perf monitor feature. */ - if ( (eax & 0xff) && (eax & 0xff00) ) - data |= X86_CR4_PCE; - /* fall through */ - case 0x7 ... 0x9: - ecx = 0; - hvm_cpuid(0x7, NULL, &ebx, &ecx, NULL); - if ( ebx & cpufeat_mask(X86_FEATURE_FSGSBASE) ) - data |= X86_CR4_FSGSBASE; - if ( ebx & cpufeat_mask(X86_FEATURE_SMEP) ) - data |= X86_CR4_SMEP; - if ( ebx & cpufeat_mask(X86_FEATURE_SMAP) ) - data |= X86_CR4_SMAP; - /* fall through */ - case 0x0 ... 0x6: - break; - } + data = hvm_cr4_guest_valid_bits(v, 0); break; case MSR_IA32_VMX_MISC: /* Do not support CR3-target feature now */