Commit 5092adb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fix from Paolo Bonzini:
 "A simple patch for a pretty bad bug: Unbreak AMD nested
  virtualization."

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: nSVM: fix switch to guest mmu
parents e572fa0e 3cf85f9f

arch/x86/kvm/svm.c

+3 −1
Original line number Diff line number Diff line
@@ -2937,6 +2937,8 @@ static void nested_svm_inject_npf_exit(struct kvm_vcpu *vcpu, 
static void nested_svm_init_mmu_context(struct kvm_vcpu *vcpu)

{

	WARN_ON(mmu_is_nested(vcpu));



	vcpu->arch.mmu = &vcpu->arch.guest_mmu;

	kvm_init_shadow_mmu(vcpu);

	vcpu->arch.mmu->set_cr3           = nested_svm_set_tdp_cr3;

	vcpu->arch.mmu->get_cr3           = nested_svm_get_tdp_cr3;
@@ -2949,6 +2951,7 @@ static void nested_svm_init_mmu_context(struct kvm_vcpu *vcpu) 


static void nested_svm_uninit_mmu_context(struct kvm_vcpu *vcpu)

{

	vcpu->arch.mmu = &vcpu->arch.root_mmu;

	vcpu->arch.walk_mmu = &vcpu->arch.root_mmu;

}
@@ -3458,7 +3461,6 @@ static void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa, 
		svm->vcpu.arch.hflags &= ~HF_HIF_MASK;



	if (nested_vmcb->control.nested_ctl & SVM_NESTED_CTL_NP_ENABLE) {

		kvm_mmu_unload(&svm->vcpu);

		svm->nested.nested_cr3 = nested_vmcb->control.nested_cr3;

		nested_svm_init_mmu_context(&svm->vcpu);

	}