From: Dongxiao Xu <dongxiao.xu@intel.com>
To: xen-devel@lists.xen.org
Subject: [PATCH 10/10] nested vmx: check host ability when intercept MSR read
Date: Tue, 4 Dec 2012 13:53:30 +0800 [thread overview]
Message-ID: <1354600410-3390-11-git-send-email-dongxiao.xu@intel.com> (raw)
In-Reply-To: <1354600410-3390-1-git-send-email-dongxiao.xu@intel.com>
When guest hypervisor tries to read MSR value, we intercept this behavior
and return certain emulated values. Besides that, we also need to ensure
that those emulated values must compatible with host ability.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
xen/arch/x86/hvm/vmx/vvmx.c | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index bbf5266..f2bba1b 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1319,19 +1319,20 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs)
*/
int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
{
- u64 data = 0, tmp = 0;
+ u64 data = 0, host_data = 0, tmp = 0;
int r = 1;
if ( !nestedhvm_enabled(current->domain) )
return 0;
+ rdmsrl(msr, host_data);
+
/*
* Remove unsupport features from n1 guest capability MSR
*/
switch (msr) {
case MSR_IA32_VMX_BASIC:
- data = VVMCS_REVISION | ((u64)PAGE_SIZE) << 32 |
- ((u64)MTRR_TYPE_WRBACK) << 50 | (1ULL << 55);
+ data = (host_data & (~0ul << 32)) | VVMCS_REVISION;
break;
case MSR_IA32_VMX_PINBASED_CTLS:
case MSR_IA32_VMX_TRUE_PINBASED_CTLS:
@@ -1342,6 +1343,8 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
/* Consult SDM for default1 setting */
tmp = ( (1<<1) | (1<<2) | (1<<4) );
data = ((data | tmp) << 32) | (tmp);
+ data = ((data & host_data) & (~0ul << 32)) |
+ ((data | host_data) & (~0u));
break;
case MSR_IA32_VMX_PROCBASED_CTLS:
case MSR_IA32_VMX_TRUE_PROCBASED_CTLS:
@@ -1373,7 +1376,8 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
tmp = 0x4006172;
/* 0-settings */
data = ((data | tmp) << 32) | (tmp);
-
+ data = ((data & host_data) & (~0ul << 32)) |
+ ((data | host_data) & (~0u));
break;
case MSR_IA32_VMX_PROCBASED_CTLS2:
/* 1-seetings */
@@ -1382,6 +1386,8 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
/* 0-settings */
tmp = 0;
data = (data << 32) | tmp;
+ data = ((data & host_data) & (~0ul << 32)) |
+ ((data | host_data) & (~0u));
break;
case MSR_IA32_VMX_EXIT_CTLS:
case MSR_IA32_VMX_TRUE_EXIT_CTLS:
@@ -1400,6 +1406,8 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
VM_EXIT_LOAD_PERF_GLOBAL_CTRL;
/* 0-settings */
data = ((data | tmp) << 32) | tmp;
+ data = ((data & host_data) & (~0ul << 32)) |
+ ((data | host_data) & (~0u));
break;
case MSR_IA32_VMX_ENTRY_CTLS:
case MSR_IA32_VMX_TRUE_ENTRY_CTLS:
@@ -1413,8 +1421,9 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
VM_ENTRY_LOAD_PERF_GLOBAL_CTRL |
VM_ENTRY_IA32E_MODE;
data = ((data | tmp) << 32) | tmp;
+ data = ((data & host_data) & (~0ul << 32)) |
+ ((data | host_data) & (~0u));
break;
-
case IA32_FEATURE_CONTROL_MSR:
data = IA32_FEATURE_CONTROL_MSR_LOCK |
IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX;
--
1.7.1
next prev parent reply other threads:[~2012-12-04 5:53 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-04 5:53 [PATCH 00/10] nested vmx: bug fixes and feature enabling Dongxiao Xu
2012-12-04 5:53 ` [PATCH 01/10] nested vmx: emulate MSR bitmaps Dongxiao Xu
2012-12-04 5:53 ` [PATCH 02/10] nested vmx: expose bit 55 of IA32_VMX_BASIC_MSR to guest VMM Dongxiao Xu
2012-12-04 9:59 ` Jan Beulich
2012-12-05 1:35 ` Xu, Dongxiao
2012-12-04 5:53 ` [PATCH 03/10] nested vmx: fix rflags status in virtual vmexit Dongxiao Xu
2012-12-04 5:53 ` [PATCH 04/10] nested vmx: fix handling of RDTSC Dongxiao Xu
2012-12-04 5:53 ` [PATCH 05/10] nested vmx: fix DR access VM exit Dongxiao Xu
2012-12-04 10:02 ` Jan Beulich
2012-12-05 1:27 ` Xu, Dongxiao
2012-12-04 5:53 ` [PATCH 06/10] nested vmx: enable IA32E mode while do VM entry Dongxiao Xu
2012-12-04 10:03 ` Jan Beulich
2012-12-05 1:26 ` Xu, Dongxiao
2012-12-04 5:53 ` [PATCH 07/10] nested vmx: enable "Virtualize APIC accesses" feature for L1 VMM Dongxiao Xu
2012-12-04 5:53 ` [PATCH 08/10] nested vmx: enable PAUSE and RDPMC exiting " Dongxiao Xu
2012-12-04 5:53 ` [PATCH 09/10] nested vmx: fix interrupt delivery to L2 guest Dongxiao Xu
2012-12-04 5:53 ` Dongxiao Xu [this message]
2012-12-04 10:05 ` [PATCH 00/10] nested vmx: bug fixes and feature enabling Jan Beulich
2012-12-05 1:37 ` Xu, Dongxiao
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=1354600410-3390-11-git-send-email-dongxiao.xu@intel.com \
--to=dongxiao.xu@intel.com \
--cc=xen-devel@lists.xen.org \
/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).