Make use of ibrs_inuse consistent.

Orabug: 27365390

Reported-by: Håkon Bugge <haakon.bugge@oracle.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 20483acf60eb906f0843b1ef6050d2ed15726a0a..fe0c299055b8041199c551bf60a40dc0b892f27f 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -8187,7 +8187,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
        if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP)
                vmx_set_interrupt_shadow(vcpu, 0);
 
-       if (ibpb_inuse &&
+       if (ibrs_inuse &&
            vmx->spec_ctrl != SPEC_CTRL_FEATURE_ENABLE_IBRS)
                wrmsrl(MSR_IA32_SPEC_CTRL, vmx->spec_ctrl);
 
@@ -8317,7 +8317,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
 #endif
              );
 
-       if (ibpb_inuse) {
+       if (ibrs_inuse) {
                rdmsrl(MSR_IA32_SPEC_CTRL, vmx->spec_ctrl);
                if (!vmx->spec_ctrl)
                        wrmsrl(MSR_IA32_SPEC_CTRL, SPEC_CTRL_FEATURE_ENABLE_IBRS);