47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
# HG changeset patch
|
|
# User Dongxiao Xu <dongxiao.xu@intel.com>
|
|
# Date 1354812981 0
|
|
# Node ID a09150b57ace2fa786dcaefa958f0b197b1b6d4c
|
|
# Parent 312f0713dfc98635fd9ed4b42481581489faa28f
|
|
nested vmx: fix handling of RDTSC
|
|
|
|
If L0 is to handle the TSC access, then we need to update guest EIP by
|
|
calling update_guest_eip().
|
|
|
|
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
|
|
Acked-by: Jan Beulich <jbeulich@suse.com>
|
|
Committed-by: Keir Fraser <keir@xen.org>
|
|
|
|
--- a/xen/arch/x86/hvm/vmx/vmx.c
|
|
+++ b/xen/arch/x86/hvm/vmx/vmx.c
|
|
@@ -1613,7 +1613,7 @@ static int get_instruction_length(void)
|
|
return len;
|
|
}
|
|
|
|
-static void update_guest_eip(void)
|
|
+void update_guest_eip(void)
|
|
{
|
|
struct cpu_user_regs *regs = guest_cpu_user_regs();
|
|
unsigned long x;
|
|
--- a/xen/arch/x86/hvm/vmx/vvmx.c
|
|
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
|
|
@@ -1558,6 +1558,7 @@ int nvmx_n2_vmexit_handler(struct cpu_us
|
|
tsc += __get_vvmcs(nvcpu->nv_vvmcx, TSC_OFFSET);
|
|
regs->eax = (uint32_t)tsc;
|
|
regs->edx = (uint32_t)(tsc >> 32);
|
|
+ update_guest_eip();
|
|
|
|
return 1;
|
|
}
|
|
--- a/xen/include/asm-x86/hvm/vmx/vmx.h
|
|
+++ b/xen/include/asm-x86/hvm/vmx/vmx.h
|
|
@@ -396,6 +396,8 @@ void ept_p2m_init(struct p2m_domain *p2m
|
|
void ept_walk_table(struct domain *d, unsigned long gfn);
|
|
void setup_ept_dump(void);
|
|
|
|
+void update_guest_eip(void);
|
|
+
|
|
/* EPT violation qualifications definitions */
|
|
#define _EPT_READ_VIOLATION 0
|
|
#define EPT_READ_VIOLATION (1UL<<_EPT_READ_VIOLATION)
|