Changeset 81790 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Nov 12, 2019 5:36:24 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134581

Message:

VMM/HMVMXR0: Propagate guest-interruptibility state from the VMCS to ring-3 and log it during VERR_VMX_INVALID_GUEST_STATE gurus.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -2551 +2551 @@
  * @param   fIsNstGstVmcs   Whether this is a nested-guest VMCS.
  */
-static int hmR0VmxCheckVmcsCtls(PVMCPUCC pVCpu, PCVMXVMCSINFO pVmcsInfo, bool fIsNstGstVmcs)
+static int hmR0VmxCheckCachedVmcsCtls(PVMCPUCC pVCpu, PCVMXVMCSINFO pVmcsInfo, bool fIsNstGstVmcs)
 {
     const char * const pcszVmcs = fIsNstGstVmcs ? "Nested-guest VMCS" : "VMCS";
@@ -9229 +9229 @@
                                             } while (0)
 
-    int        rc;
-    PVMCC        pVM    = pVCpu->CTX_SUFF(pVM);
+    PVMCC      pVM    = pVCpu->CTX_SUFF(pVM);
     PCPUMCTX   pCtx   = &pVCpu->cpum.GstCtx;
     uint32_t   uError = VMX_IGS_ERROR;
-    uint32_t   u32Val;
+    uint32_t   u32IntrState = 0;
     bool const fUnrestrictedGuest = pVM->hm.s.vmx.fUnrestrictedGuest;
-
     do
     {
+        int rc;
+
+        /*
+         * Guest-interruptibility state.
+         * Read this first so as to record its value for ring-3 propagation.
+         */
+        rc = VMXReadVmcs32(VMX_VMCS32_GUEST_INT_STATE, &u32IntrState);
+        AssertRC(rc);
+
+        uint32_t u32Val;
+        uint64_t u64Val;
+
         /*
          * CR0.
@@ -9275 +9285 @@
          * IA32_DEBUGCTL MSR.
          */
-        uint64_t u64Val;
         rc = VMXReadVmcs64(VMX_VMCS64_GUEST_DEBUGCTL_FULL, &u64Val);
         AssertRC(rc);
@@ -9642 +9651 @@
         HMVMX_CHECK_BREAK(   !(pCtx->ss.Attr.n.u2Dpl)
                           || u32ActivityState != VMX_VMCS_GUEST_ACTIVITY_HLT, VMX_IGS_ACTIVITY_STATE_HLT_INVALID);
-        uint32_t u32IntrState;
-        rc = VMXReadVmcs32(VMX_VMCS32_GUEST_INT_STATE, &u32IntrState);
-        AssertRC(rc);
+
         if (   u32IntrState == VMX_VMCS_GUEST_INT_STATE_BLOCK_MOVSS
             || u32IntrState == VMX_VMCS_GUEST_INT_STATE_BLOCK_STI)
@@ -9758 +9765 @@
 
     pVCpu->hm.s.u32HMError = uError;
+    pVCpu->hm.s.vmx.LastError.u32GuestIntrState = u32IntrState;
     return uError;
 
@@ -10634 +10642 @@
     hmR0VmxCheckAutoLoadStoreMsrs(pVCpu, pVmcsInfo, pVmxTransient->fIsNestedGuest);
     hmR0VmxCheckHostEferMsr(pVCpu, pVmcsInfo);
-    AssertRC(hmR0VmxCheckVmcsCtls(pVCpu, pVmcsInfo, pVmxTransient->fIsNestedGuest));
+    AssertRC(hmR0VmxCheckCachedVmcsCtls(pVCpu, pVmcsInfo, pVmxTransient->fIsNestedGuest));
 #endif
 
@@ -14624 +14632 @@
     AssertRCReturn(rc, rc);
 
-    rc = hmR0VmxCheckVmcsCtls(pVCpu, pVmcsInfo, pVmxTransient->fIsNestedGuest);
+    rc = hmR0VmxCheckCachedVmcsCtls(pVCpu, pVmcsInfo, pVmxTransient->fIsNestedGuest);
     if (RT_FAILURE(rc))
         return rc;