diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-02-24 18:59:11 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-04-25 13:53:01 +0300 |
| commit | 0e5cbe368b366f02cf3fe707aea2c0efac1bf70e (patch) | |
| tree | 3c652974ca75df9b8b06504760362e9335f634a2 /arch/x86/kvm/svm.c | |
| parent | e02317153e77150fed9609c3212c98204ec3ea74 (diff) | |
| download | linux-stable-0e5cbe368b366f02cf3fe707aea2c0efac1bf70e.tar.gz linux-stable-0e5cbe368b366f02cf3fe707aea2c0efac1bf70e.tar.bz2 linux-stable-0e5cbe368b366f02cf3fe707aea2c0efac1bf70e.zip | |
KVM: SVM: Reset MMU on nested_svm_vmrun for NPT too
Without resetting the MMU the gva_to_pga function will not
work reliably when the vcpu is running in nested context.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/svm.c')
| -rw-r--r-- | arch/x86/kvm/svm.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 44679530ad5d..ef40b90219f6 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1877,10 +1877,12 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) if (npt_enabled) { svm->vmcb->save.cr3 = nested_vmcb->save.cr3; svm->vcpu.arch.cr3 = nested_vmcb->save.cr3; - } else { + } else kvm_set_cr3(&svm->vcpu, nested_vmcb->save.cr3); - kvm_mmu_reset_context(&svm->vcpu); - } + + /* Guest paging mode is active - reset mmu */ + kvm_mmu_reset_context(&svm->vcpu); + svm->vmcb->save.cr2 = svm->vcpu.arch.cr2 = nested_vmcb->save.cr2; kvm_register_write(&svm->vcpu, VCPU_REGS_RAX, nested_vmcb->save.rax); kvm_register_write(&svm->vcpu, VCPU_REGS_RSP, nested_vmcb->save.rsp); |