diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-12-06 16:56:21 +0000 |
|---|---|---|
| committer | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-12-06 16:56:21 +0000 |
| commit | 441fb37db42d856c2ea7a0f9022534133ff7870a (patch) | |
| tree | 4c2ed99070c4ae7f94343d3d35d8c880e4317e47 | |
| parent | 3d605ee7378409ed1d52a0591df963313bb8b4c5 (diff) | |
| download | xen-441fb37db42d856c2ea7a0f9022534133ff7870a.tar.gz xen-441fb37db42d856c2ea7a0f9022534133ff7870a.tar.bz2 xen-441fb37db42d856c2ea7a0f9022534133ff7870a.zip | |
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>
| -rw-r--r-- | xen/arch/x86/hvm/vmx/vmx.c | 2 | ||||
| -rw-r--r-- | xen/arch/x86/hvm/vmx/vvmx.c | 1 | ||||
| -rw-r--r-- | xen/include/asm-x86/hvm/vmx/vmx.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 3bb0d99a4b..9fb9562031 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1555,7 +1555,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; diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index d8b7ce58c7..dab9551358 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1614,6 +1614,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, tsc += __get_vvmcs(nvcpu->nv_vvmcx, TSC_OFFSET); regs->eax = (uint32_t)tsc; regs->edx = (uint32_t)(tsc >> 32); + update_guest_eip(); return 1; } diff --git a/xen/include/asm-x86/hvm/vmx/vmx.h b/xen/include/asm-x86/hvm/vmx/vmx.h index c4c2fe8b0c..aa5b0809d1 100644 --- a/xen/include/asm-x86/hvm/vmx/vmx.h +++ b/xen/include/asm-x86/hvm/vmx/vmx.h @@ -399,6 +399,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) |