Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52c65a30 authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: Check for nested vmrun intercept before emulating vmrun 



This patch lets the nested vmrun fail if the L1 hypervisor
has not intercepted vmrun. This fixes the "vmrun intercept
check" unit test.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 4132779b

arch/x86/kvm/svm.c

+19 −0
Original line number Diff line number Diff line
@@ -2014,6 +2014,14 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) 
	return true;

}



static bool nested_vmcb_checks(struct vmcb *vmcb)

{

	if ((vmcb->control.intercept & (1ULL << INTERCEPT_VMRUN)) == 0)

		return false;



	return true;

}



static bool nested_svm_vmrun(struct vcpu_svm *svm)

{

	struct vmcb *nested_vmcb;
@@ -2028,6 +2036,17 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) 
	if (!nested_vmcb)

		return false;



	if (!nested_vmcb_checks(nested_vmcb)) {

		nested_vmcb->control.exit_code    = SVM_EXIT_ERR;

		nested_vmcb->control.exit_code_hi = 0;

		nested_vmcb->control.exit_info_1  = 0;

		nested_vmcb->control.exit_info_2  = 0;



		nested_svm_unmap(page);



		return false;

	}



	trace_kvm_nested_vmrun(svm->vmcb->save.rip - 3, vmcb_gpa,

			       nested_vmcb->save.rip,

			       nested_vmcb->control.int_ctl,