Changeset 74154 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 8, 2018 11:31:22 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 vmlaunch/vmresume bits.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMVMXAll.cpp (modified) (1 diff)
• IEMAllCImplVmxInstr.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/HMVMXAll.cpp

@@ -160 +160 @@
     VMX_INSTR_DIAG_DESC(kVmxVInstrDiag_Vmentry_GuestEferMsr             , "GuestEferMsr"            ),
     VMX_INSTR_DIAG_DESC(kVmxVInstrDiag_Vmentry_GuestEferMsrRsvd         , "GuestEferMsrRsvd"        ),
+    VMX_INSTR_DIAG_DESC(kVmxVInstrDiag_Vmentry_GuestGdtrBase            , "GuestGdtrBase"           ),
+    VMX_INSTR_DIAG_DESC(kVmxVInstrDiag_Vmentry_GuestGdtrLimit           , "GuestGdtrLimit"          ),
+    VMX_INSTR_DIAG_DESC(kVmxVInstrDiag_Vmentry_GuestIdtrBase            , "GuestIdtrBase"           ),
+    VMX_INSTR_DIAG_DESC(kVmxVInstrDiag_Vmentry_GuestIdtrLimit           , "GuestIdtrLimit"          ),
     VMX_INSTR_DIAG_DESC(kVmxVInstrDiag_Vmentry_GuestPae                 , "GuestPae"                ),
     VMX_INSTR_DIAG_DESC(kVmxVInstrDiag_Vmentry_GuestPatMsr              , "GuestPatMsr"             ),

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -2779 +2779 @@
 }
 
+
+/**
+ * Checks guest GDTR and IDTR as part of VM-entry.
+ *
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   pszInstr        The VMX instruction name (for logging purposes).
+ */
+IEM_STATIC int iemVmxVmentryCheckGuestGdtrIdtr(PVMCPU pVCpu,  const char *pszInstr)
+{
+    /*
+     * GDTR and IDTR.
+     * See Intel spec. 26.3.1.3 "Checks on Guest Descriptor-Table Registers".
+     */
+    PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
+    const char *const pszFailure = "VM-exit";
+    if (IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fLongMode)
+    {
+        /* Base. */
+        if (X86_IS_CANONICAL(pVmcs->u64GuestGdtrBase.u))
+        { /* likely */ }
+        else
+            IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVInstrDiag_Vmentry_GuestGdtrBase);
+
+        if (X86_IS_CANONICAL(pVmcs->u64GuestIdtrBase.u))
+        { /* likely */ }
+        else
+            IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVInstrDiag_Vmentry_GuestIdtrBase);
+    }
+
+    /* Limit. */
+    if (!RT_HI_U16(pVmcs->u32GuestGdtrLimit))
+    { /* likely */ }
+    else
+        IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVInstrDiag_Vmentry_GuestGdtrLimit);
+
+    if (!RT_HI_U16(pVmcs->u32GuestIdtrLimit))
+    { /* likely */ }
+    else
+        IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVInstrDiag_Vmentry_GuestIdtrLimit);
+
+    NOREF(pszInstr);
+    NOREF(pszFailure);
+    return VINF_SUCCESS;
+}
+
+
 /**
  * Checks guest-state as part of VM-entry.
@@ -2799 +2845 @@
     else
         return rc;
+
+    rc = iemVmxVmentryCheckGuestGdtrIdtr(pVCpu, pszInstr);
+    if (rc == VINF_SUCCESS)
+    { /* likely */ }
+    else
+        return rc;
+
 
     return VINF_SUCCESS;