diff options
| author | Christoph Egger <Christoph.Egger@amd.com> | 2012-10-25 15:33:39 +0200 |
|---|---|---|
| committer | Christoph Egger <Christoph.Egger@amd.com> | 2012-10-25 15:33:39 +0200 |
| commit | bc16803fa89ec9b12e89361d98b48b3e49bec046 (patch) | |
| tree | 29c58b1c1fe892a010c1e68f9d26eecac7d45dab | |
| parent | 2614ed22f2b83711a2dda6e2d68a720c5ff7e19b (diff) | |
| download | xen-bc16803fa89ec9b12e89361d98b48b3e49bec046.tar.gz xen-bc16803fa89ec9b12e89361d98b48b3e49bec046.tar.bz2 xen-bc16803fa89ec9b12e89361d98b48b3e49bec046.zip | |
nestedsvm: fix VMEXIT emulation
Values in regs can be newer than those in the shadow vmcb (e.g. due to
an instruction emulation right before). So use the values from regs.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Tim Deegan <tim@xen.org>
xen-unstable changeset: 26096:d642720e1ea9
xen-unstable date: Tue Oct 23 07:14:27 UTC 2012
Committed-by: Jan Beulich <jbeulich@suse.com>
| -rw-r--r-- | xen/arch/x86/hvm/svm/nestedsvm.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index 16f73e13cc..a3db54580e 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -995,7 +995,7 @@ nsvm_vmcb_guest_intercepts_trap(struct vcpu *v, unsigned int trapnr, int errcode } static int -nsvm_vmcb_prepare4vmexit(struct vcpu *v) +nsvm_vmcb_prepare4vmexit(struct vcpu *v, struct cpu_user_regs *regs) { struct nestedvcpu *nv = &vcpu_nestedhvm(v); struct nestedsvm *svm = &vcpu_nestedsvm(v); @@ -1119,17 +1119,22 @@ nsvm_vmcb_prepare4vmexit(struct vcpu *v) ns_vmcb->_dr7 = n2vmcb->_dr7; ns_vmcb->_dr6 = n2vmcb->_dr6; + /* Restore registers from regs as those values + * can be newer than in n2vmcb (e.g. due to an + * instruction emulation right before). + */ + /* RFLAGS */ - ns_vmcb->rflags = n2vmcb->rflags; + ns_vmcb->rflags = n2vmcb->rflags = regs->eflags; /* RIP */ - ns_vmcb->rip = n2vmcb->rip; + ns_vmcb->rip = n2vmcb->rip = regs->eip; /* RSP */ - ns_vmcb->rsp = n2vmcb->rsp; + ns_vmcb->rsp = n2vmcb->rsp = regs->esp; /* RAX */ - ns_vmcb->rax = n2vmcb->rax; + ns_vmcb->rax = n2vmcb->rax = regs->eax; /* Keep the l2 guest values of the fs, gs, ldtr, tr, kerngsbase, * star, lstar, cstar, sfmask, sysenter_cs, sysenter_esp, @@ -1363,7 +1368,7 @@ nestedsvm_vmexit_n2n1(struct vcpu *v, struct cpu_user_regs *regs) ASSERT(vcpu_nestedhvm(v).nv_vmswitch_in_progress); ASSERT(nestedhvm_vcpu_in_guestmode(v)); - rc = nsvm_vmcb_prepare4vmexit(v); + rc = nsvm_vmcb_prepare4vmexit(v, regs); if (rc) ret = NESTEDHVM_VMEXIT_ERROR; |