Commit e7134c1b authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

x86: KVM: svm: eliminate weird goto from vmrun_interception() 



Regardless of whether or not nested_svm_vmrun_msrpm() fails, we return 1
from vmrun_interception() so there's no point in doing goto. Also,
nested_svm_vmrun_msrpm() call can be made from nested_svm_vmrun() where
other nested launch issues are handled.

nested_svm_vmrun() returns a bool, however, its result is ignored in
vmrun_interception() as we always return '1'. As a preparatory change
to putting kvm_skip_emulated_instruction() inside nested_svm_vmrun()
make nested_svm_vmrun() return an int (always '1' for now).

Suggested-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c4762fda

arch/x86/kvm/svm.c

+14 −22
Original line number Diff line number Diff line
@@ -3583,7 +3583,7 @@ static void enter_svm_guest_mode(struct vcpu_svm *svm, u64 vmcb_gpa, 
	mark_all_dirty(svm->vmcb);

}



static bool nested_svm_vmrun(struct vcpu_svm *svm)

static int nested_svm_vmrun(struct vcpu_svm *svm)

{

	int rc;

	struct vmcb *nested_vmcb;
@@ -3598,7 +3598,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) 
	if (rc) {

		if (rc == -EINVAL)

			kvm_inject_gp(&svm->vcpu, 0);

		return false;

		return 1;

	}



	nested_vmcb = map.hva;
@@ -3611,7 +3611,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) 


		kvm_vcpu_unmap(&svm->vcpu, &map, true);



		return false;

		return 1;

	}



	trace_kvm_nested_vmrun(svm->vmcb->save.rip, vmcb_gpa,
@@ -3655,7 +3655,16 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) 


	enter_svm_guest_mode(svm, vmcb_gpa, nested_vmcb, &map);



	return true;

	if (!nested_svm_vmrun_msrpm(svm)) {

		svm->vmcb->control.exit_code    = SVM_EXIT_ERR;

		svm->vmcb->control.exit_code_hi = 0;

		svm->vmcb->control.exit_info_1  = 0;

		svm->vmcb->control.exit_info_2  = 0;



		nested_svm_vmexit(svm);

	}



	return 1;

}



static void nested_svm_vmloadsave(struct vmcb *from_vmcb, struct vmcb *to_vmcb)
@@ -3734,24 +3743,7 @@ static int vmrun_interception(struct vcpu_svm *svm) 
	/* Save rip after vmrun instruction */

	kvm_rip_write(&svm->vcpu, kvm_rip_read(&svm->vcpu) + 3);



	if (!nested_svm_vmrun(svm))

		return 1;



	if (!nested_svm_vmrun_msrpm(svm))

		goto failed;



	return 1;



failed:



	svm->vmcb->control.exit_code    = SVM_EXIT_ERR;

	svm->vmcb->control.exit_code_hi = 0;

	svm->vmcb->control.exit_info_1  = 0;

	svm->vmcb->control.exit_info_2  = 0;



	nested_svm_vmexit(svm);



	return 1;

	return nested_svm_vmrun(svm);

}



static int stgi_interception(struct vcpu_svm *svm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE