@@ -3662,6 +3662,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
3662
3662
SECONDARY_EXEC_ENABLE_EPT |
3663
3663
SECONDARY_EXEC_UNRESTRICTED_GUEST |
3664
3664
SECONDARY_EXEC_PAUSE_LOOP_EXITING |
3665
+ SECONDARY_EXEC_DESC |
3665
3666
SECONDARY_EXEC_RDTSCP |
3666
3667
SECONDARY_EXEC_ENABLE_INVPCID |
3667
3668
SECONDARY_EXEC_APIC_REGISTER_VIRT |
@@ -4369,6 +4370,14 @@ static int vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
4369
4370
(to_vmx (vcpu )-> rmode .vm86_active ?
4370
4371
KVM_RMODE_VM_CR4_ALWAYS_ON : KVM_PMODE_VM_CR4_ALWAYS_ON );
4371
4372
4373
+ if ((cr4 & X86_CR4_UMIP ) && !boot_cpu_has (X86_FEATURE_UMIP )) {
4374
+ vmcs_set_bits (SECONDARY_VM_EXEC_CONTROL ,
4375
+ SECONDARY_EXEC_DESC );
4376
+ hw_cr4 &= ~X86_CR4_UMIP ;
4377
+ } else
4378
+ vmcs_clear_bits (SECONDARY_VM_EXEC_CONTROL ,
4379
+ SECONDARY_EXEC_DESC );
4380
+
4372
4381
if (cr4 & X86_CR4_VMXE ) {
4373
4382
/*
4374
4383
* To use VMXON (and later other VMX instructions), a guest
@@ -5308,6 +5317,7 @@ static void vmx_compute_secondary_exec_control(struct vcpu_vmx *vmx)
5308
5317
struct kvm_vcpu * vcpu = & vmx -> vcpu ;
5309
5318
5310
5319
u32 exec_control = vmcs_config .cpu_based_2nd_exec_ctrl ;
5320
+
5311
5321
if (!cpu_need_virtualize_apic_accesses (vcpu ))
5312
5322
exec_control &= ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES ;
5313
5323
if (vmx -> vpid == 0 )
@@ -5326,6 +5336,11 @@ static void vmx_compute_secondary_exec_control(struct vcpu_vmx *vmx)
5326
5336
exec_control &= ~(SECONDARY_EXEC_APIC_REGISTER_VIRT |
5327
5337
SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY );
5328
5338
exec_control &= ~SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE ;
5339
+
5340
+ /* SECONDARY_EXEC_DESC is enabled/disabled on writes to CR4.UMIP,
5341
+ * in vmx_set_cr4. */
5342
+ exec_control &= ~SECONDARY_EXEC_DESC ;
5343
+
5329
5344
/* SECONDARY_EXEC_SHADOW_VMCS is enabled when L1 executes VMPTRLD
5330
5345
(handle_vmptrld).
5331
5346
We can NOT enable shadow_vmcs here because we don't have yet
@@ -6101,6 +6116,12 @@ static int handle_set_cr4(struct kvm_vcpu *vcpu, unsigned long val)
6101
6116
return kvm_set_cr4 (vcpu , val );
6102
6117
}
6103
6118
6119
+ static int handle_desc (struct kvm_vcpu * vcpu )
6120
+ {
6121
+ WARN_ON (!(vcpu -> arch .cr4 & X86_CR4_UMIP ));
6122
+ return emulate_instruction (vcpu , 0 ) == EMULATE_DONE ;
6123
+ }
6124
+
6104
6125
static int handle_cr (struct kvm_vcpu * vcpu )
6105
6126
{
6106
6127
unsigned long exit_qualification , val ;
@@ -8193,6 +8214,8 @@ static int (*const kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {
8193
8214
[EXIT_REASON_XSETBV ] = handle_xsetbv ,
8194
8215
[EXIT_REASON_TASK_SWITCH ] = handle_task_switch ,
8195
8216
[EXIT_REASON_MCE_DURING_VMENTRY ] = handle_machine_check ,
8217
+ [EXIT_REASON_GDTR_IDTR ] = handle_desc ,
8218
+ [EXIT_REASON_LDTR_TR ] = handle_desc ,
8196
8219
[EXIT_REASON_EPT_VIOLATION ] = handle_ept_violation ,
8197
8220
[EXIT_REASON_EPT_MISCONFIG ] = handle_ept_misconfig ,
8198
8221
[EXIT_REASON_PAUSE_INSTRUCTION ] = handle_pause ,
@@ -9157,7 +9180,8 @@ static bool vmx_xsaves_supported(void)
9157
9180
9158
9181
static bool vmx_umip_emulated (void )
9159
9182
{
9160
- return false;
9183
+ return vmcs_config .cpu_based_2nd_exec_ctrl &
9184
+ SECONDARY_EXEC_DESC ;
9161
9185
}
9162
9186
9163
9187
static void vmx_recover_nmi_blocking (struct vcpu_vmx * vmx )
@@ -9755,7 +9779,8 @@ static void vmcs_set_secondary_exec_control(u32 new_ctl)
9755
9779
u32 mask =
9756
9780
SECONDARY_EXEC_SHADOW_VMCS |
9757
9781
SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE |
9758
- SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES ;
9782
+ SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
9783
+ SECONDARY_EXEC_DESC ;
9759
9784
9760
9785
u32 cur_ctl = vmcs_read32 (SECONDARY_VM_EXEC_CONTROL );
9761
9786
0 commit comments