KVM: nSVM: move kvm_set_cr3() after nested_svm_uninit_mmu_context() (bf7dea42) · Commits · 戴 / test

kvm_mmu_new_pgd() refers to arch.mmu and at this point it still references arch.guest_mmu while arch.root_mmu is expected. Note, the change is effectively a nop: when !npt_enabled, nested_svm_uninit_mmu_context() does nothing (as we don't do nested_svm_init_mmu_context()) and with npt_enabled we don't do kvm_set_cr3(). However, it will matter when we move the call to kvm_mmu_new_pgd into nested_svm_load_cr3(). No functional change intended. Signed-off-by:

Vitaly Kuznetsov <vkuznets@redhat.com> Message-Id: <20200710141157.1640173-7-vkuznets@redhat.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/svm/nested.c

+8 −6

Original line number	Diff line number	Diff line
		@@ -636,12 +636,6 @@ int nested_svm_vmexit(struct vcpu_svm *svm)
		svm_set_efer(&svm->vcpu, hsave->save.efer);
		svm_set_cr0(&svm->vcpu, hsave->save.cr0 \| X86_CR0_PE);
		svm_set_cr4(&svm->vcpu, hsave->save.cr4);
		if (npt_enabled) {
		svm->vmcb->save.cr3 = hsave->save.cr3;
		svm->vcpu.arch.cr3 = hsave->save.cr3;
		} else {
		(void)kvm_set_cr3(&svm->vcpu, hsave->save.cr3);
		}
		kvm_rax_write(&svm->vcpu, hsave->save.rax);
		kvm_rsp_write(&svm->vcpu, hsave->save.rsp);
		kvm_rip_write(&svm->vcpu, hsave->save.rip);
		@@ -661,6 +655,14 @@ int nested_svm_vmexit(struct vcpu_svm *svm)
		kvm_vcpu_unmap(&svm->vcpu, &map, true);

		nested_svm_uninit_mmu_context(&svm->vcpu);

		if (npt_enabled) {
		svm->vmcb->save.cr3 = hsave->save.cr3;
		svm->vcpu.arch.cr3 = hsave->save.cr3;
		} else {
		(void)kvm_set_cr3(&svm->vcpu, hsave->save.cr3);
		}

		kvm_mmu_reset_context(&svm->vcpu);
		kvm_mmu_load(&svm->vcpu);

Admin message