On Fri, 2021-09-03 at 12:20 +0200, Emanuele Giuseppe Esposito wrote:
> Inline nested_vmcb_check_cr3_cr4 as it is not called by anyone else.
> Doing so simplifies next patches.
>
> Signed-off-by: Emanuele Giuseppe Esposito <eesposit@xxxxxxxxxx>
> ---
> arch/x86/kvm/svm/nested.c | 35 +++++++++++++----------------------
> 1 file changed, 13 insertions(+), 22 deletions(-)
>
> diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c
> index e5515477c30a..d2fe65e2a7a4 100644
> --- a/arch/x86/kvm/svm/nested.c
> +++ b/arch/x86/kvm/svm/nested.c
> @@ -260,27 +260,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)
> @@ -302,7 +281,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)))
Reviewed-by: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
Best regards,
Maxim Levitsky
