Commit 4e810adb authored by Wanpeng Li's avatar Wanpeng Li Committed by Paolo Bonzini
Browse files

KVM: SVM: Analyze is_guest_mode() in svm_vcpu_run() 



Analyze is_guest_mode() in svm_vcpu_run() instead of svm_exit_handlers_fastpath()
in conformity with VMX version.

Suggested-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarWanpeng Li <wanpengli@tencent.com>
Message-Id: <1600066548-4343-1-git-send-email-wanpengli@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1a5488ef

arch/x86/kvm/svm/svm.c

+6 −5
Original line number Diff line number Diff line
@@ -3393,8 +3393,7 @@ static void svm_cancel_injection(struct kvm_vcpu *vcpu) 


static fastpath_t svm_exit_handlers_fastpath(struct kvm_vcpu *vcpu)

{

	if (!is_guest_mode(vcpu) &&

	    to_svm(vcpu)->vmcb->control.exit_code == SVM_EXIT_MSR &&

	if (to_svm(vcpu)->vmcb->control.exit_code == SVM_EXIT_MSR &&

	    to_svm(vcpu)->vmcb->control.exit_info_1)

		return handle_fastpath_set_msr_irqoff(vcpu);
@@ -3459,7 +3458,6 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu, 


static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)

{

	fastpath_t exit_fastpath;

	struct vcpu_svm *svm = to_svm(vcpu);



	svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];
@@ -3580,8 +3578,11 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) 
		svm_handle_mce(svm);



	svm_complete_interrupts(svm);

	exit_fastpath = svm_exit_handlers_fastpath(vcpu);

	return exit_fastpath;



	if (is_guest_mode(vcpu))

		return EXIT_FASTPATH_NONE;



	return svm_exit_handlers_fastpath(vcpu);

}



static void svm_load_mmu_pgd(struct kvm_vcpu *vcpu, unsigned long root,

CRA Git | Maintained and supported by SUSTech CRA and CCSE