From: Dongxiao Xu <dongxiao.xu@intel.com>
To: xen-devel@lists.xen.org
Subject: [PATCH 02/10] nested vmx: expose bit 55 of IA32_VMX_BASIC_MSR to guest VMM
Date: Tue, 4 Dec 2012 13:53:22 +0800 [thread overview]
Message-ID: <1354600410-3390-3-git-send-email-dongxiao.xu@intel.com> (raw)
In-Reply-To: <1354600410-3390-1-git-send-email-dongxiao.xu@intel.com>
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
xen/arch/x86/hvm/vmx/vvmx.c | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index 719bfce..cf91c7c 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1299,7 +1299,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs)
*/
int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
{
- u64 data = 0, tmp;
+ u64 data = 0, tmp = 0;
int r = 1;
if ( !nestedhvm_enabled(current->domain) )
@@ -1311,18 +1311,20 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
switch (msr) {
case MSR_IA32_VMX_BASIC:
data = VVMCS_REVISION | ((u64)PAGE_SIZE) << 32 |
- ((u64)MTRR_TYPE_WRBACK) << 50;
+ ((u64)MTRR_TYPE_WRBACK) << 50 | (1ULL << 55);
break;
case MSR_IA32_VMX_PINBASED_CTLS:
+ case MSR_IA32_VMX_TRUE_PINBASED_CTLS:
/* 1-seetings */
data = PIN_BASED_EXT_INTR_MASK |
PIN_BASED_NMI_EXITING |
PIN_BASED_PREEMPT_TIMER;
- data <<= 32;
- /* 0-settings */
- data |= 0;
+ /* Consult SDM for default1 setting */
+ tmp = ( (1<<1) | (1<<2) | (1<<4) );
+ data = ((data | tmp) << 32) | (tmp);
break;
case MSR_IA32_VMX_PROCBASED_CTLS:
+ case MSR_IA32_VMX_TRUE_PROCBASED_CTLS:
/* 1-seetings */
data = CPU_BASED_HLT_EXITING |
CPU_BASED_VIRTUAL_INTR_PENDING |
@@ -1342,10 +1344,14 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
CPU_BASED_VIRTUAL_NMI_PENDING |
CPU_BASED_ACTIVATE_MSR_BITMAP |
CPU_BASED_ACTIVATE_SECONDARY_CONTROLS;
- /* bit 1, 4-6,8,13-16,26 must be 1 (refer G4 of SDM) */
- tmp = ( (1<<26) | (0xf << 13) | 0x100 | (0x7 << 4) | 0x2);
+ /* Consult SDM for default1 setting */
+ if ( msr == MSR_IA32_VMX_PROCBASED_CTLS )
+ tmp = 0x401e172;
+ else if ( msr == MSR_IA32_VMX_TRUE_PROCBASED_CTLS )
+ tmp = 0x4006172;
/* 0-settings */
data = ((data | tmp) << 32) | (tmp);
+
break;
case MSR_IA32_VMX_PROCBASED_CTLS2:
/* 1-seetings */
@@ -1355,9 +1361,12 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
data = (data << 32) | tmp;
break;
case MSR_IA32_VMX_EXIT_CTLS:
- /* 1-seetings */
- /* bit 0-8, 10,11,13,14,16,17 must be 1 (refer G4 of SDM) */
- tmp = 0x36dff;
+ case MSR_IA32_VMX_TRUE_EXIT_CTLS:
+ /* Consult SDM for default1 setting */
+ if ( msr == MSR_IA32_VMX_EXIT_CTLS )
+ tmp = 0x36dff;
+ else if ( msr == MSR_IA32_VMX_TRUE_EXIT_CTLS )
+ tmp = 0x36dfb;
data = VM_EXIT_ACK_INTR_ON_EXIT |
VM_EXIT_IA32E_MODE |
VM_EXIT_SAVE_PREEMPT_TIMER |
@@ -1370,8 +1379,12 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
data = ((data | tmp) << 32) | tmp;
break;
case MSR_IA32_VMX_ENTRY_CTLS:
- /* bit 0-8, and 12 must be 1 (refer G5 of SDM) */
- tmp = 0x11ff;
+ case MSR_IA32_VMX_TRUE_ENTRY_CTLS:
+ /* Consult SDM for default1 setting */
+ if ( msr == MSR_IA32_VMX_ENTRY_CTLS )
+ tmp = 0x11ff;
+ else if ( msr == MSR_IA32_VMX_TRUE_ENTRY_CTLS )
+ tmp = 0x11fb;
data = VM_ENTRY_LOAD_GUEST_PAT |
VM_ENTRY_LOAD_GUEST_EFER |
VM_ENTRY_LOAD_PERF_GLOBAL_CTRL;
--
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 ` Dongxiao Xu [this message]
2012-12-04 9:59 ` [PATCH 02/10] nested vmx: expose bit 55 of IA32_VMX_BASIC_MSR to guest VMM 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 ` [PATCH 10/10] nested vmx: check host ability when intercept MSR read Dongxiao Xu
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-3-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).