Mailing List Archive

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
xen/arch/x86/hvm/vmx/vvmx.c | 18 ++++++++++++++++--
xen/include/asm-x86/hvm/vmx/vmcs.h | 1 +
2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index 23c949b..e5d812a 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -237,6 +237,13 @@ static void reg_write(struct cpu_user_regs *regs,
*pval = value;
}

+static inline u32 __n2_pin_exec_control(struct vcpu *v)
+{
+ struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);
+
+ return __get_vvmcs(nvcpu->nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL);
+}
+
static inline u32 __n2_exec_control(struct vcpu *v)
{
struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);
@@ -511,7 +518,6 @@ static void nvmx_update_pin_control(struct vcpu *v, unsigned long host_cntrl)
struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);

shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL);
- shadow_cntrl &= ~PIN_BASED_PREEMPT_TIMER;
shadow_cntrl |= host_cntrl;
__vmwrite(PIN_BASED_VM_EXEC_CONTROL, shadow_cntrl);
}
@@ -641,6 +647,7 @@ static const u16 vmcs_gstate_field[] = {
GUEST_INTERRUPTIBILITY_INFO,
GUEST_ACTIVITY_STATE,
GUEST_SYSENTER_CS,
+ GUEST_PREEMPTION_TIMER,
/* natural */
GUEST_ES_BASE,
GUEST_CS_BASE,
@@ -1269,7 +1276,9 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
break;
case MSR_IA32_VMX_PINBASED_CTLS:
/* 1-seetings */
- data = PIN_BASED_EXT_INTR_MASK | PIN_BASED_NMI_EXITING;
+ data = PIN_BASED_EXT_INTR_MASK |
+ PIN_BASED_NMI_EXITING |
+ PIN_BASED_PREEMPT_TIMER;
data <<= 32;
/* 0-settings */
data |= 0;
@@ -1513,6 +1522,11 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs,
if ( ctrl & SECONDARY_EXEC_DESCRIPTOR_TABLE_EXITING )
nvcpu->nv_vmexit_pending = 1;
break;
+ case EXIT_REASON_VMX_PREEMPTION_TIMER_EXPIRED:
+ ctrl = __n2_pin_exec_control(v);
+ if ( ctrl & PIN_BASED_PREEMPT_TIMER )
+ nvcpu->nv_vmexit_pending = 1;
+ break;
/* L1 has priority handling several other types of exits */
case EXIT_REASON_HLT:
ctrl = __n2_exec_control(v);
diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h
index 053de17..fbe9a52 100644
--- a/xen/include/asm-x86/hvm/vmx/vmcs.h
+++ b/xen/include/asm-x86/hvm/vmx/vmcs.h
@@ -357,6 +357,7 @@ enum vmcs_field {
GUEST_INTERRUPTIBILITY_INFO = 0x00004824,
GUEST_ACTIVITY_STATE = 0x00004826,
GUEST_SYSENTER_CS = 0x0000482A,
+ GUEST_PREEMPTION_TIMER = 0x0000482e,
HOST_SYSENTER_CS = 0x00004c00,
CR0_GUEST_HOST_MASK = 0x00006000,
CR4_GUEST_HOST_MASK = 0x00006002,
--
1.7.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel