lkml.org 
[lkml]   [2018]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 058/100] KVM: x86: Do not use kvm_x86_ops->mpx_supported() directly
    Date
    From: Liran Alon <liran.alon@oracle.com>

    [ Upstream commit 503234b3fdcaa578395c07e393ea3e5d13958824 ]

    Commit a87036add092 ("KVM: x86: disable MPX if host did not enable
    MPX XSAVE features") introduced kvm_mpx_supported() to return true
    iff MPX is enabled in the host.

    However, that commit seems to have missed replacing some calls to
    kvm_x86_ops->mpx_supported() to kvm_mpx_supported().

    Complete original commit by replacing remaining calls to
    kvm_mpx_supported().

    Fixes: a87036add092 ("KVM: x86: disable MPX if host did not enable
    MPX XSAVE features")

    Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com>
    Signed-off-by: Liran Alon <liran.alon@oracle.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/kvm/vmx.c | 2 +-
    arch/x86/kvm/x86.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
    index ea691ddfc3aa..2e23fce5eb1f 100644
    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -11567,7 +11567,7 @@ static void prepare_vmcs02_full(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)

    set_cr4_guest_host_mask(vmx);

    - if (vmx_mpx_supported())
    + if (kvm_mpx_supported())
    vmcs_write64(GUEST_BNDCFGS, vmcs12->guest_bndcfgs);

    if (enable_vpid) {
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index 97fcac34e007..3cd58a5eb449 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -4625,7 +4625,7 @@ static void kvm_init_msr_list(void)
    */
    switch (msrs_to_save[i]) {
    case MSR_IA32_BNDCFGS:
    - if (!kvm_x86_ops->mpx_supported())
    + if (!kvm_mpx_supported())
    continue;
    break;
    case MSR_TSC_AUX:
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-16 06:56    [W:4.746 / U:0.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site