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

torvalds · torvalds · commit 5092adb2272e · 2018-12-21T11:15:36.000-08:00
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
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
@@ -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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -2937,6 +2937,8 @@ static void nested_svm_inject_npf_exit(struct kvm_vcpu *vcpu,`
`2937`	`2937`	`static void nested_svm_init_mmu_context(struct kvm_vcpu *vcpu)`
`2938`	`2938`	`{`
`2939`	`2939`	`WARN_ON(mmu_is_nested(vcpu));`
	`2940`	`+`
	`2941`	`+ vcpu->arch.mmu = &vcpu->arch.guest_mmu;`
`2940`	`2942`	`kvm_init_shadow_mmu(vcpu);`
`2941`	`2943`	`vcpu->arch.mmu->set_cr3 = nested_svm_set_tdp_cr3;`
`2942`	`2944`	`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)`
`2949`	`2951`
`2950`	`2952`	`static void nested_svm_uninit_mmu_context(struct kvm_vcpu *vcpu)`
`2951`	`2953`	`{`
	`2954`	`+ vcpu->arch.mmu = &vcpu->arch.root_mmu;`
`2952`	`2955`	`vcpu->arch.walk_mmu = &vcpu->arch.root_mmu;`
`2953`	`2956`	`}`
`2954`	`2957`
`@@ -3458,7 +3461,6 @@ static void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa,`
`3458`	`3461`	`svm->vcpu.arch.hflags &= ~HF_HIF_MASK;`
`3459`	`3462`
`3460`	`3463`	`if (nested_vmcb->control.nested_ctl & SVM_NESTED_CTL_NP_ENABLE) {`
`3461`		`- kvm_mmu_unload(&svm->vcpu);`
`3462`	`3464`	`svm->nested.nested_cr3 = nested_vmcb->control.nested_cr3;`
`3463`	`3465`	`nested_svm_init_mmu_context(&svm->vcpu);`
`3464`	`3466`	`}`