From: Jun Nakajima <jun.nakajima@intel.com>
Date: Wed, 27 Dec 2017 19:16:23 +0000 (-0800)
Subject: Make use of ibrs_inuse consistent.
X-Git-Tag: v4.1.12-124.31.3~1290
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e49b70cd81b500111f55232002e0290a3d49a7b3;p=users%2Fjedix%2Flinux-maple.git

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 20483acf60eb..fe0c299055b8 100644
--- 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);