From: Yang Zhang <yang.z.zhang@intel.com>
To: xen-devel@lists.xensource.com
Cc: Yang Zhang <yang.z.zhang@Intel.com>,
Andrew.Cooper3@citrix.com, eddie.dong@intel.com,
JBeulich@suse.com
Subject: [PATCH v2 1/3] Nested VMX: Check VMX capability before read VMX related MSRs.
Date: Tue, 10 Sep 2013 14:14:25 +0800 [thread overview]
Message-ID: <1378793667-6694-2-git-send-email-yang.z.zhang@intel.com> (raw)
In-Reply-To: <1378793667-6694-1-git-send-email-yang.z.zhang@intel.com>
From: Yang Zhang <yang.z.zhang@Intel.com>
VMX MSRs only available when the CPU support the VMX feature. In addition,
VMX_TRUE* MSRs only available when bit 55 of VMX_BASIC MSR is set.
Signed-off-by: Yang Zhang <yang.z.zhang@Intel.com>
---
xen/arch/x86/hvm/vmx/vvmx.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index cecc72f..c6c8b88 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1814,12 +1814,31 @@ 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;
u64 data = 0, host_data = 0;
int r = 1;
if ( !nestedhvm_enabled(v->domain) )
return 0;
+ /*
+ * VMX capablitys MSRs available only when guest
+ * support VMX.
+ */
+ hvm_cpuid(0x1, &eax, &ebx, &ecx, &edx);
+ if ( !(ecx & cpufeat_mask(X86_FEATURE_VMXE)) )
+ return 0;
+
+ /*
+ * Those MSRs available only when bit 55 of
+ * MSR_IA32_VMX_BASIC is set.
+ */
+ rdmsrl(MSR_IA32_VMX_BASIC, data);
+ if ( msr >= MSR_IA32_VMX_TRUE_PINBASED_CTLS &&
+ msr <= MSR_IA32_VMX_TRUE_ENTRY_CTLS &&
+ !(data & VMX_BASIC_DEFAULT1_ZERO) )
+ return 0;
+
rdmsrl(msr, host_data);
/*
--
1.7.1
next prev parent reply other threads:[~2013-09-10 6:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-10 6:14 [PATCH v2 0/3] Nested VMX: fix bugs when reading VMX MSRs Yang Zhang
2013-09-10 6:14 ` Yang Zhang [this message]
2013-09-10 10:56 ` [PATCH v2 1/3] Nested VMX: Check VMX capability before read VMX related MSRs Andrew Cooper
2013-09-11 0:40 ` Zhang, Yang Z
2013-09-10 13:41 ` Jan Beulich
2013-09-11 0:41 ` Zhang, Yang Z
2013-09-10 6:14 ` [PATCH v2 2/3] Nested VMX: Clear bit 31 of IA32_VMX_BASIC MSR Yang Zhang
2013-09-10 8:51 ` Andrew Cooper
2013-09-10 6:14 ` [PATCH v2 3/3] Nested VMX: Fix IA32_VMX_CR4_FIXED1 msr emulation Yang Zhang
2013-09-10 13:45 ` Jan Beulich
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=1378793667-6694-2-git-send-email-yang.z.zhang@intel.com \
--to=yang.z.zhang@intel.com \
--cc=Andrew.Cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=eddie.dong@intel.com \
--cc=xen-devel@lists.xensource.com \
/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).