lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 1/8] KVM: nSVM: move nested_vmcb_check_cr3_cr4 logic in nested_vmcb_valid_sregs
    Date
    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@redhat.com>
    Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
    ---
    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)))
    --
    2.27.0
    \
     
     \ /
      Last update: 2021-10-11 16:38    [W:3.997 / U:0.660 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site