From: Dongxiao Xu <dongxiao.xu@intel.com>
To: xen-devel@lists.xen.org
Subject: [PATCH 04/10] nested vmx: fix handling of RDTSC
Date: Tue, 4 Dec 2012 13:53:24 +0800 [thread overview]
Message-ID: <1354600410-3390-5-git-send-email-dongxiao.xu@intel.com> (raw)
In-Reply-To: <1354600410-3390-1-git-send-email-dongxiao.xu@intel.com>
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>
---
xen/arch/x86/hvm/vmx/vmx.c | 2 +-
xen/arch/x86/hvm/vmx/vvmx.c | 1 +
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 3bb0d99..9fb9562 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 6a8caaa..cf3797c 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1626,6 +1626,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 c4c2fe8..aa5b080 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)
--
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 ` Dongxiao Xu [this message]
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-5-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).