Changeset 23553 in vbox

Timestamp:

Oct 5, 2009 11:38:47 AM (15 years ago)

Author:

vboxsync

Message:

More assertions

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (1 diff)
• VMMAll/HWACCMAll.cpp (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -433 +433 @@
         int    rc;
 
-        rc = STAMR3RegisterF(pVM, &pVCpu->hwaccm.s.StatSpinPoke, STAMTYPE_PROFILE, STAMVISIBILITY_USED, STAMUNIT_TICKS_PER_CALL, "Profiling of VMXR0RunGuestCode entry",
+        rc = STAMR3RegisterF(pVM, &pVCpu->hwaccm.s.StatPoke, STAMTYPE_PROFILE, STAMVISIBILITY_USED, STAMUNIT_TICKS_PER_CALL, "Profiling of RTMpPokeCpu",
+                             "/PROF/HWACCM/CPU%d/Poke", i);
+        AssertRC(rc);
+        rc = STAMR3RegisterF(pVM, &pVCpu->hwaccm.s.StatSpinPoke, STAMTYPE_PROFILE, STAMVISIBILITY_USED, STAMUNIT_TICKS_PER_CALL, "Profiling of poke wait",
                              "/PROF/HWACCM/CPU%d/PokeWait", i);
         AssertRC(rc);
-        rc = STAMR3RegisterF(pVM, &pVCpu->hwaccm.s.StatSpinPokeFailed, STAMTYPE_PROFILE, STAMVISIBILITY_USED, STAMUNIT_TICKS_PER_CALL, "Profiling of VMXR0RunGuestCode entry",
+        rc = STAMR3RegisterF(pVM, &pVCpu->hwaccm.s.StatSpinPokeFailed, STAMTYPE_PROFILE, STAMVISIBILITY_USED, STAMUNIT_TICKS_PER_CALL, "Profiling of poke wait when RTMpPokeCpu fails",
                              "/PROF/HWACCM/CPU%d/PokeWaitFailed", i);
         AssertRC(rc);

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -769 +769 @@
     STAMPROFILEADV          StatWorldSwitch3264;
 #endif
+    STAMPROFILEADV          StatPoke;
     STAMPROFILEADV          StatSpinPoke;
     STAMPROFILEADV          StatSpinPokeFailed;

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

@@ -123 +123 @@
     uint32_t cWorldSwitchExit = pVCpu->hwaccm.s.cWorldSwitchExit;
 
+    STAM_PROFILE_ADV_START(&pVCpu->hwaccm.s.StatPoke, x);
     int rc = RTMpPokeCpu(idHostCpu);
+    STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatPoke, x);
     /* Not implemented on some platforms (Darwin, Linux kernel < 2.6.19); fall back to a less efficient implementation (broadcast). */
     if (rc == VERR_NOT_SUPPORTED)

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

@@ -190 +190 @@
         pVCpu->hwaccm.s.svm.pVMCBHost     = RTR0MemObjAddress(pVCpu->hwaccm.s.svm.pMemObjVMCBHost);
         pVCpu->hwaccm.s.svm.pVMCBHostPhys = RTR0MemObjGetPagePhysAddr(pVCpu->hwaccm.s.svm.pMemObjVMCBHost, 0);
+        Assert(pVCpu->hwaccm.s.svm.pVMCBHostPhys < _4G);
         ASMMemZeroPage(pVCpu->hwaccm.s.svm.pVMCBHost);
 
@@ -199 +200 @@
         pVCpu->hwaccm.s.svm.pVMCB     = RTR0MemObjAddress(pVCpu->hwaccm.s.svm.pMemObjVMCB);
         pVCpu->hwaccm.s.svm.pVMCBPhys = RTR0MemObjGetPagePhysAddr(pVCpu->hwaccm.s.svm.pMemObjVMCB, 0);
+        Assert(pVCpu->hwaccm.s.svm.pVMCBPhys < _4G);
         ASMMemZeroPage(pVCpu->hwaccm.s.svm.pVMCB);