Commit 907afa48 authored by Emanuele Giuseppe Esposito's avatar Emanuele Giuseppe Esposito Committed by Paolo Bonzini
Browse files

KVM: nSVM: move nested_vmcb_check_cr3_cr4 logic in nested_vmcb_valid_sregs 



Inline nested_vmcb_check_cr3_cr4 as it is not called by anyone else.
Doing so simplifies next patches.

Signed-off-by: default avatarEmanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20211103140527.752797-2-eesposit@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 244893fa

arch/x86/kvm/svm/nested.c

+13 −22
Original line number Diff line number Diff line
@@ -275,27 +275,6 @@ static bool nested_vmcb_check_controls(struct kvm_vcpu *vcpu, 
	return true;

}



static bool nested_vmcb_check_cr3_cr4(struct kvm_vcpu *vcpu,

				      struct vmcb_save_area *save)

{

	/*

	 * These checks are also performed by KVM_SET_SREGS,

	 * except that EFER.LMA is not checked by SVM against

	 * CR0.PG && EFER.LME.

	 */

	if ((save->efer & EFER_LME) && (save->cr0 & X86_CR0_PG)) {

		if (CC(!(save->cr4 & X86_CR4_PAE)) ||

		    CC(!(save->cr0 & X86_CR0_PE)) ||

		    CC(kvm_vcpu_is_illegal_gpa(vcpu, save->cr3)))

			return false;

	}



	if (CC(!kvm_is_valid_cr4(vcpu, save->cr4)))

		return false;



	return true;

}



/* Common checks that apply to both L1 and L2 state.  */

static bool nested_vmcb_valid_sregs(struct kvm_vcpu *vcpu,

				    struct vmcb_save_area *save)
@@ -317,7 +296,19 @@ static bool nested_vmcb_valid_sregs(struct kvm_vcpu *vcpu, 
	if (CC(!kvm_dr6_valid(save->dr6)) || CC(!kvm_dr7_valid(save->dr7)))

		return false;



	if (!nested_vmcb_check_cr3_cr4(vcpu, save))

	/*

	 * These checks are also performed by KVM_SET_SREGS,

	 * except that EFER.LMA is not checked by SVM against

	 * CR0.PG && EFER.LME.

	 */

	if ((save->efer & EFER_LME) && (save->cr0 & X86_CR0_PG)) {

		if (CC(!(save->cr4 & X86_CR4_PAE)) ||

		    CC(!(save->cr0 & X86_CR0_PE)) ||

		    CC(kvm_vcpu_is_illegal_gpa(vcpu, save->cr3)))

			return false;

	}



	if (CC(!kvm_is_valid_cr4(vcpu, save->cr4)))

		return false;



	if (CC(!kvm_valid_efer(vcpu, save->efer)))