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

Timestamp:

Sep 9, 2018 6:11:30 PM (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) (3 diffs)

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

@@ -150 +150 @@
     VMXV_DIAG_DESC(kVmxVDiag_Vmentry_ExitCtlsAllowed1         , "ExitCtlsAllowed1"          ),
     VMXV_DIAG_DESC(kVmxVDiag_Vmentry_ExitCtlsDisallowed0      , "ExitCtlsDisallowed0"       ),
+    VMXV_DIAG_DESC(kVmxVDiag_Vmentry_GuestActStateHlt         , "GuestActStateHlt"          ),
+    VMXV_DIAG_DESC(kVmxVDiag_Vmentry_GuestActStateRsvd        , "GuestActStateRsvd"         ),
+    VMXV_DIAG_DESC(kVmxVDiag_Vmentry_GuestActStateShutdown    , "GuestActStateShutdown"     ),
+    VMXV_DIAG_DESC(kVmxVDiag_Vmentry_GuestActStateSsDpl       , "GuestActStateSsDpl"        ),
+    VMXV_DIAG_DESC(kVmxVDiag_Vmentry_GuestActStateStiMovSs    , "GuestActStateStiMovSs"     ),
     VMXV_DIAG_DESC(kVmxVDiag_Vmentry_GuestCr0Fixed0           , "GuestCr0Fixed0"            ),
     VMXV_DIAG_DESC(kVmxVDiag_Vmentry_GuestCr0Fixed1           , "GuestCr0Fixed1"            ),

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

@@ -2900 +2900 @@
 
 /**
+ * Checks guest non-register state 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 iemVmxVmentryCheckGuestNonRegState(PVMCPU pVCpu,  const char *pszInstr)
+{
+    /*
+     * Guest non-register state.
+     * See Intel spec. 26.3.1.5 "Checks on Guest Non-Register State".
+     */
+    PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
+    const char *const pszFailure = "VM-exit";
+
+    /*
+     * Activity state.
+     */
+    if (!(pVmcs->u32GuestActivityState & VMX_V_GUEST_ACTIVITY_STATE_MASK))
+    { /* likely */ }
+    else
+        IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_GuestActStateRsvd);
+
+    X86DESCATTR SsAttr; SsAttr.u = pVmcs->u32GuestSsAttr;
+    if (SsAttr.n.u2Dpl != 0)
+    {
+        if (pVmcs->u32GuestActivityState != VMX_VMCS_GUEST_ACTIVITY_HLT)
+        { /* likely */ }
+        else
+            IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_GuestActStateSsDpl);
+    }
+
+    if (   pVmcs->u32GuestIntrState == VMX_VMCS_GUEST_INT_STATE_BLOCK_STI
+        || pVmcs->u32GuestIntrState == VMX_VMCS_GUEST_INT_STATE_BLOCK_MOVSS)
+    {
+        if (pVmcs->u32GuestActivityState == VMX_VMCS_GUEST_ACTIVITY_ACTIVE)
+        { /* likely */ }
+        else
+            IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_GuestActStateStiMovSs);
+    }
+
+    if (VMX_ENTRY_INT_INFO_IS_VALID(pVmcs->u32EntryIntInfo))
+    {
+        uint8_t const uIntType = VMX_ENTRY_INT_INFO_TYPE(pVmcs->u32EntryIntInfo);
+        uint8_t const uVector  = VMX_ENTRY_INT_INFO_VECTOR(pVmcs->u32EntryIntInfo);
+        switch (pVmcs->u32GuestActivityState)
+        {
+            case VMX_VMCS_GUEST_ACTIVITY_HLT:
+            {
+                if (   uIntType == VMX_ENTRY_INT_INFO_TYPE_EXT_INT
+                    || uIntType == VMX_ENTRY_INT_INFO_TYPE_NMI
+                    || (   uIntType == VMX_ENTRY_INT_INFO_TYPE_HW_XCPT
+                        && (   uVector == X86_XCPT_DB
+                            || uVector == X86_XCPT_MC))
+                    || (   uIntType == VMX_ENTRY_INT_INFO_TYPE_OTHER_EVENT
+                        && uVector == 0))
+                { /* likely */ }
+                else
+                    IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_GuestActStateHlt);
+                break;
+            }
+
+            case VMX_VMCS_GUEST_ACTIVITY_SHUTDOWN:
+            {
+                if (   uIntType == VMX_ENTRY_INT_INFO_TYPE_NMI
+                    || (   uIntType == VMX_ENTRY_INT_INFO_TYPE_HW_XCPT
+                        && uVector == X86_XCPT_MC))
+                { /* likely */ }
+                else
+                    IEM_VMX_VMENTRY_FAILED_RET(pVCpu, pszInstr, pszFailure, kVmxVDiag_Vmentry_GuestActStateShutdown);
+                break;
+            }
+
+            case VMX_VMCS_GUEST_ACTIVITY_ACTIVE:
+            default:
+                break;
+        }
+    }
+
+    /*
+     * Interruptibility state.
+     */
+    /** @todo NSTVMX: interruptibility-state. */
+
+    NOREF(pszInstr);
+    NOREF(pszFailure);
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Checks guest-state as part of VM-entry.
  *
@@ -2927 +3017 @@
 
     rc = iemVmxVmentryCheckGuestRipRFlags(pVCpu, pszInstr);
+    if (rc == VINF_SUCCESS)
+    { /* likely */ }
+    else
+        return rc;
+
+    rc = iemVmxVmentryCheckGuestNonRegState(pVCpu, pszInstr);
     if (rc == VINF_SUCCESS)
     { /* likely */ }
@@ -3653 +3749 @@
     }
 
-
     pVCpu->cpum.GstCtx.hwvirt.vmx.enmDiag = kVmxVDiag_Vmentry_Success;
     iemVmxVmSucceed(pVCpu);