1 files changed, 15 insertions, 13 deletions

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index c7668806163f..3f1696570b41 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1494,6 +1494,12 @@ static inline bool cpu_has_vmx_vmfunc(void)
                 SECONDARY_EXEC_ENABLE_VMFUNC;
 }
 
+static bool vmx_umip_emulated(void)
+{
+        return vmcs_config.cpu_based_2nd_exec_ctrl &
+                SECONDARY_EXEC_DESC;
+}
+
 static inline bool report_flexpriority(void)
 {
         return flexpriority_enabled;
@@ -4761,14 +4767,16 @@ static int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
         else
                 hw_cr4 |= KVM_PMODE_VM_CR4_ALWAYS_ON;
 
-        if ((cr4 & X86_CR4_UMIP) && !boot_cpu_has(X86_FEATURE_UMIP)) {
-                vmcs_set_bits(SECONDARY_VM_EXEC_CONTROL,
-                              SECONDARY_EXEC_DESC);
-                hw_cr4 &= ~X86_CR4_UMIP;
-        } else if (!is_guest_mode(vcpu) ||
-                   !nested_cpu_has2(get_vmcs12(vcpu), SECONDARY_EXEC_DESC))
-                vmcs_clear_bits(SECONDARY_VM_EXEC_CONTROL,
+        if (!boot_cpu_has(X86_FEATURE_UMIP) && vmx_umip_emulated()) {
+                if (cr4 & X86_CR4_UMIP) {
+                        vmcs_set_bits(SECONDARY_VM_EXEC_CONTROL,
                                 SECONDARY_EXEC_DESC);
+                        hw_cr4 &= ~X86_CR4_UMIP;
+                } else if (!is_guest_mode(vcpu) ||
+                        !nested_cpu_has2(get_vmcs12(vcpu), SECONDARY_EXEC_DESC))
+                        vmcs_clear_bits(SECONDARY_VM_EXEC_CONTROL,
+                                        SECONDARY_EXEC_DESC);
+        }
 
         if (cr4 & X86_CR4_VMXE) {
                 /*
@@ -9497,12 +9505,6 @@ static bool vmx_xsaves_supported(void)
                 SECONDARY_EXEC_XSAVES;
 }
 
-static bool vmx_umip_emulated(void)
-{
-        return vmcs_config.cpu_based_2nd_exec_ctrl &
-                SECONDARY_EXEC_DESC;
-}
-
 static void vmx_recover_nmi_blocking(struct vcpu_vmx *vmx)
 {
         u32 exit_intr_info;