儲存庫 vbox 的更動 12162

時間撮記:

2008-9-5 下午11:28:27 (16 年 以前)

作者:

vboxsync

訊息:

VMM: Assert that we don't change CPU unexpectedly while executing in VT-x or AMD-V mode. (strict builds only)

位置:

trunk/src/VBox/VMM

檔案:

• HWACCMInternal.h (修改) (1 筆差異)
• VMMR0/HWACCMR0.cpp (修改) (3 筆差異)
• VMMR0/HWVMXR0.cpp (修改) (2 筆差異)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -387 +387 @@
         bool                    fHostDebugRegsSaved;
     } savedhoststate;
+#endif
+
+#ifdef VBOX_STRICT
+    /** The CPU ID of the CPU currently owning the VMCS. Set in
+     * HWACCMR0Enter and cleared in HWACCMR0Leave. */
+    RTCPUID                 idEnteredCpu;
+# if HC_ARCH_BITS == 32
+    RTCPUID                 Alignment0;
+# endif
 #endif
 

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

@@ -681 +681 @@
     pVM->hwaccm.s.cpuid.u32AMDFeatureEDX    = HWACCMR0Globals.cpuid.u32AMDFeatureEDX;
     pVM->hwaccm.s.lLastError                = HWACCMR0Globals.lLastError;
+#ifdef VBOX_STRICT
+    pVM->hwaccm.s.idEnteredCpu              = NIL_RTCPUID;
+#endif
 
     /* Init a VT-x or AMD-V VM. */
@@ -774 +777 @@
     rc |= HWACCMR0Globals.pfnLoadGuestState(pVM, pCtx);
     AssertRC(rc);
+
+#ifdef VBOX_STRICT
+    /* keep track of the CPU owning the VMCS for debugging scheduling weirdness and ring-3 calls. */
+    if (RT_SUCCESS(rc))
+    {
+        AssertMsg(pVM->hwaccm.s.idEnteredCpu == NIL_RTCPUID, ("%d", (int)pVM->hwaccm.s.idEnteredCpu));
+        pVM->hwaccm.s.idEnteredCpu = idCpu;
+    }
+#endif
     return rc;
 }
@@ -826 +838 @@
     /* Resync the debug register on the next entry. */
     pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_DEBUG;
-    return HWACCMR0Globals.pfnLeaveSession(pVM);
+    rc = HWACCMR0Globals.pfnLeaveSession(pVM);
+
+#ifdef VBOX_STRICT
+    /* keep track of the CPU owning the VMCS for debugging scheduling weirdness and ring-3 calls. */
+    RTCPUID idCpu = RTMpCpuId();
+    AssertMsg(pVM->hwaccm.s.idEnteredCpu == idCpu, ("owner is %d, I'm %d", (int)pVM->hwaccm.s.idEnteredCpu, (int)idCpu));
+    pVM->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
+#endif
+
+    return rc;
 }
 

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

@@ -1195 +1195 @@
      */
 ResumeExecution:
+    AssertMsg(pVM->hwaccm.s.idEnteredCpu == RTMpCpuId(),
+              ("Expected %d, I'm %d; cResume=%d exitReason=%RTreg exitQualification=%RTreg\n",
+               (int)pVM->hwaccm.s.idEnteredCpu, (int)RTMpCpuId(), cResume, exitReason, exitQualification));
+
     /* Safety precaution; looping for too long here can have a very bad effect on the host */
     if (++cResume > HWACCM_MAX_RESUME_LOOPS)
@@ -1763 +1767 @@
             case X86_XCPT_DB:   /* Debug exception. */
             {
-                /* DR6, DR7.GD and IA32_DEBUGCTL.LBR are not updated yet. 
+                /* DR6, DR7.GD and IA32_DEBUGCTL.LBR are not updated yet.
                  *
                  * Exit qualification bits: