lkml.org 
[lkml]   [2024]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 45/49] KVM: x86: Shuffle code to prepare for dropping guest_cpuid_has()
    From
    Move the implementations of guest_has_{spec_ctrl,pred_cmd}_msr() down
    below guest_cpu_cap_has() so that their use of guest_cpuid_has() can be
    replaced with calls to guest_cpu_cap_has().

    No functional change intended.

    Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    arch/x86/kvm/cpuid.h | 30 +++++++++++++++---------------
    1 file changed, 15 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h
    index 60da304db4e4..7be56fa62342 100644
    --- a/arch/x86/kvm/cpuid.h
    +++ b/arch/x86/kvm/cpuid.h
    @@ -168,21 +168,6 @@ static inline int guest_cpuid_stepping(struct kvm_vcpu *vcpu)
    return x86_stepping(best->eax);
    }

    -static inline bool guest_has_spec_ctrl_msr(struct kvm_vcpu *vcpu)
    -{
    - return (guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) ||
    - guest_cpuid_has(vcpu, X86_FEATURE_AMD_STIBP) ||
    - guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBRS) ||
    - guest_cpuid_has(vcpu, X86_FEATURE_AMD_SSBD));
    -}
    -
    -static inline bool guest_has_pred_cmd_msr(struct kvm_vcpu *vcpu)
    -{
    - return (guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) ||
    - guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBPB) ||
    - guest_cpuid_has(vcpu, X86_FEATURE_SBPB));
    -}
    -
    static inline bool supports_cpuid_fault(struct kvm_vcpu *vcpu)
    {
    return vcpu->arch.msr_platform_info & MSR_PLATFORM_INFO_CPUID_FAULT;
    @@ -301,4 +286,19 @@ static inline bool kvm_vcpu_is_legal_cr3(struct kvm_vcpu *vcpu, unsigned long cr
    return kvm_vcpu_is_legal_gpa(vcpu, cr3);
    }

    +static inline bool guest_has_spec_ctrl_msr(struct kvm_vcpu *vcpu)
    +{
    + return (guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) ||
    + guest_cpuid_has(vcpu, X86_FEATURE_AMD_STIBP) ||
    + guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBRS) ||
    + guest_cpuid_has(vcpu, X86_FEATURE_AMD_SSBD));
    +}
    +
    +static inline bool guest_has_pred_cmd_msr(struct kvm_vcpu *vcpu)
    +{
    + return (guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) ||
    + guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBPB) ||
    + guest_cpuid_has(vcpu, X86_FEATURE_SBPB));
    +}
    +
    #endif
    --
    2.45.0.215.g3402c0e53f-goog

    \
     
     \ /
      Last update: 2024-05-27 18:30    [W:6.430 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site