Changeset 20871 in vbox

Timestamp:

Jun 24, 2009 1:56:19 AM (16 years ago)

Author:

vboxsync

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

49017

Message:

VMM: Make sure there is enough room for a few physical handler notification before we disable ring-3 calls. Partial VMM[GC|R0]CallHost unification.

Location:

trunk

Files:

• include/VBox/err.h (modified) (2 diffs)
• include/VBox/rem.h (modified) (1 diff)
• include/VBox/vmm.h (modified) (1 diff)
• src/VBox/VMM/EM.cpp (modified) (3 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/REMAll.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMGC/VMMGC.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMGuruMeditation.cpp (modified) (1 diff)
• src/VBox/VMM/VMMInternal.h (modified) (2 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMRZ/VMMRZ.cpp (added)
• src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (2 diffs)

trunk/include/VBox/err.h

@@ -811 +811 @@
  * @{
  */
-/** Reason for leaving GC: Calling host function. */
+/** Reason for leaving RZ: Calling host function. */
 #define VINF_VMM_CALL_HOST                  2700
 /** Reason for leaving R0: Hit a ring-0 assertion on EMT. */
@@ -817 +817 @@
 /** The hyper CR3 differs between PGM and CPUM. */
 #define VERR_VMM_HYPER_CR3_MISMATCH         (-2702)
+/** Reason for leaving RZ: Illegal call to ring-3. */
+#define VERR_VMM_RING3_CALL_DISABLED        (-2703)
 /** @} */
 

trunk/include/VBox/rem.h

@@ -53 +53 @@
 VMMDECL(void) REMNotifyHandlerPhysicalModify(PVM pVM, PGMPHYSHANDLERTYPE enmType, RTGCPHYS GCPhysOld, RTGCPHYS GCPhysNew, RTGCPHYS cb, bool fHasHCHandler, bool fRestoreAsRAM);
 #endif /* IN_RING0 || IN_RC */
+#ifdef IN_RC
+VMMDECL(void) REMNotifyHandlerPhysicalFlushIfAlmostFull(PVM pVM, PVMCPU pVCpu);
+#endif
 VMMDECL(void) REMFlushTBs(PVM pVM);
 

trunk/include/VBox/vmm.h

@@ -372 +372 @@
 VMMRCDECL(void)     VMMGCGuestToHost(PVM pVM, int rc);
 VMMRCDECL(int)      VMMGCCallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg);
-VMMRCDECL(bool)     VMMGCLogDisable(PVM pVM);
-VMMRCDECL(void)     VMMGCLogRestore(PVM pVM, bool fLog);
 VMMRCDECL(void)     VMMGCLogFlushIfFull(PVM pVM);
 /** @} */
 #endif /* IN_RC */
 
+#if defined(IN_RC) || defined(IN_RING0)
+/** @defgroup grp_vmm_rz    The VMM Raw-Mode and Ring-0 Context API
+ * @ingroup grp_vmm
+ * @{
+ */
+VMMRZDECL(int)      VMMRZCallRing3(PVM pVM, PVMCPU pVCpu, VMMCALLHOST enmOperation, uint64_t uArg);
+VMMRZDECL(int)      VMMRZCallRing3NoCpu(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg);
+VMMRZDECL(void)     VMMRZCallRing3Disable(PVMCPU pVCpu);
+VMMRZDECL(void)     VMMRZCallRing3Enable(PVMCPU pVCpu);
+VMMRZDECL(bool)     VMMRZCallRing3IsEnabled(PVMCPU pVCpu);
+/** @} */
+#endif
+
 
 /** @} */

trunk/src/VBox/VMM/EM.cpp

@@ -827 +827 @@
                         case VERR_VMM_RING0_ASSERTION:
                         case VERR_VMM_HYPER_CR3_MISMATCH:
+                        case VERR_VMM_RING3_CALL_DISABLED:
                             return rcLast;
                     }
@@ -844 +845 @@
                 case VERR_VMM_RING0_ASSERTION:
                 case VERR_VMM_HYPER_CR3_MISMATCH:
+                case VERR_VMM_RING3_CALL_DISABLED:
                 case VERR_INTERNAL_ERROR:
                 case VERR_INTERNAL_ERROR_2:
@@ -2574 +2576 @@
         case VERR_VMM_RING0_ASSERTION:
         case VERR_VMM_HYPER_CR3_MISMATCH:
+        case VERR_VMM_RING3_CALL_DISABLED:
             break;
 

trunk/src/VBox/VMM/Makefile.kmk

@@ -322 +322 @@
         VMMGC/HWACCMGCA.asm \
         VMMRZ/DBGFRZ.cpp \
+        VMMRZ/VMMRZ.cpp \
         VMMAll/CPUMAllRegs.cpp \
         VMMAll/CPUMAllA.asm \
@@ -415 +416 @@
         VMMR0/VMMR0.cpp \
         VMMRZ/DBGFRZ.cpp \
+        VMMRZ/VMMRZ.cpp \
         VMMAll/CPUMAllA.asm \
         VMMAll/CPUMAllRegs.cpp \

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -4365 +4365 @@
 
 #  ifdef IN_RC
-    /* NOTE: We can't deal with jumps to ring 3 here as we're now in an inconsistent state! */
-    bool fLog = VMMGCLogDisable(pVM);
+    /*
+     * WARNING! We can't deal with jumps to ring 3 in the code below as the
+     *          state will be inconsistent! Flush important things now while
+     *          we still can and then make sure there are no ring-3 calls.
+     */
+    REMNotifyHandlerPhysicalFlushIfAlmostFull(pVM, pVCpu);
+    VMMRZCallRing3Disable(pVCpu);
 #  endif
 
@@ -4401 +4406 @@
 
 #  ifdef IN_RC
-    VMMGCLogRestore(pVM, fLog);
+    /* NOTE: The state is consistent again. */
+    VMMRZCallRing3Enable(pVCpu);
 #  endif
 

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

@@ -22 +22 @@
 
 /*******************************************************************************
-*   Global Variables                                                           *
+*   Header Files                                                               *
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_REM
@@ -80 +80 @@
 
 /**
- * Flushes the handler notifications by calling the host.
- *
- * @param   pVM     The VM handle.
- */
-static void remFlushHandlerNotifications(PVM pVM)
-{
-#ifdef IN_RC
-    VMMGCCallHost(pVM, VMMCALLHOST_REM_REPLAY_HANDLER_NOTIFICATIONS, 0);
-#elif defined(IN_RING0)
-    /** @todo necessary? */
-    VMMR0CallHost(pVM, VMMCALLHOST_REM_REPLAY_HANDLER_NOTIFICATIONS, 0);
-#else
-    AssertReleaseMsgFailed(("Ring 3 call????.\n"));
-#endif
-}
-
-
-/**
  * Insert pending notification
  *
@@ -120 +102 @@
                 Assert(cFlushes++ != 128);
                 AssertFatal(cFlushes < _1M);
-                remFlushHandlerNotifications(pVM);
+                VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_REM_REPLAY_HANDLER_NOTIFICATIONS, 0);
                 idxFree = ASMAtomicUoReadU32(&pVM->rem.s.idxFreeList);
             } while (idxFree == (uint32_t)-1);
@@ -145 +127 @@
 
     VM_FF_SET(pVM, VM_FF_REM_HANDLER_NOTIFY);
-
-#if 0 /* Enable this to trigger odd flush bugs. */
-    remFlushHandlerNotifications(pVM);
-#endif
 }
 
@@ -222 +200 @@
 #endif /* !IN_RING3 */
 
+#ifdef IN_RC
+/**
+ * Flushes the physical handler notifications if the queue is almost full.
+ *
+ * This is for avoiding trouble in RC when changing CR3.
+ *
+ * @param   pVM         The VM handle.
+ * @param   pVCpu       The virtual CPU handle of the calling EMT.
+ */
+VMMDECL(void) REMNotifyHandlerPhysicalFlushIfAlmostFull(PVM pVM, PVMCPU pVCpu)
+{
+    Assert(pVM->cCPUs == 1);
+
+    /*
+     * Less than 10 items means we should flush.
+     */
+    uint32_t cFree = 0;
+    for (uint32_t idx = pVM->rem.s.idxFreeList;
+         idx != UINT32_MAX;
+         idx = pVM->rem.s.aHandlerNotifications[idx].idxNext)
+    {
+        Assert(idx < RT_ELEMENTS(pVM->rem.s.aHandlerNotifications));
+        if (++cFree > 10)
+            return;
+    }
+
+    /* Ok, we gotta flush them. */
+    VMMRZCallRing3NoCpu(pVM, VMMCALLHOST_REM_REPLAY_HANDLER_NOTIFICATIONS, 0);
+}
+#endif /* IN_RC */
+
+
 /**
  * Make REM flush all translation block upon the next call to REMR3State().

trunk/src/VBox/VMM/VMMGC/VMMGC.cpp

@@ -190 +190 @@
         &&  pVM->vmm.s.pRCLoggerRC->offScratch >= (sizeof(pVM->vmm.s.pRCLoggerRC->achScratch)*3/4))
     {
+        if (pVM->vmm.s.fRCLoggerFlushingDisabled)
+            return; /* fail quietly. */
         VMMGCCallHost(pVM, VMMCALLHOST_VMM_LOGGER_FLUSH, 0);
     }
-}
-
-/**
- * Disables the GC logger temporarily, restore with VMMGCLogRestore.
- *
- * @param   pVM             The VM handle.
- */
-VMMRCDECL(bool) VMMGCLogDisable(PVM pVM)
-{
-    bool fLog = pVM->vmm.s.pRCLoggerRC
-             && !(pVM->vmm.s.pRCLoggerRC->fFlags & RTLOGFLAGS_DISABLED);
-    if (fLog)
-        pVM->vmm.s.pRCLoggerRC->fFlags |= RTLOGFLAGS_DISABLED;
-    return fLog;
-}
-
-
-/**
- * Restores the GC logger after a call to VMMGCLogDisable.
- *
- * @param   pVM             The VM handle.
- * @param   fLog            What VMMGCLogDisable returned.
- */
-VMMRCDECL(void) VMMGCLogRestore(PVM pVM, bool fLog)
-{
-    if (fLog && pVM->vmm.s.pRCLoggerRC)
-        pVM->vmm.s.pRCLoggerRC->fFlags &= ~RTLOGFLAGS_DISABLED;
 }
 
@@ -241 +216 @@
  * @param   enmOperation    The operation.
  * @param   uArg            The argument to the operation.
+ *
+ * @deprecated Use VMMRZCallRing3.
  */
 VMMRCDECL(int) VMMGCCallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg)
 {
-    PVMCPU pVCpu = VMMGetCpu0(pVM);
-
-/** @todo profile this! */
-    pVCpu->vmm.s.enmCallHostOperation = enmOperation;
-    pVCpu->vmm.s.u64CallHostArg = uArg;
-    pVCpu->vmm.s.rcCallHost = VERR_INTERNAL_ERROR;
-    pVM->vmm.s.pfnGuestToHostRC(VINF_VMM_CALL_HOST);
-    return pVCpu->vmm.s.rcCallHost;
+    return VMMRZCallRing3(pVM, VMMGetCpu0(pVM), enmOperation, uArg);
 }
 

trunk/src/VBox/VMM/VMMGuruMeditation.cpp

@@ -245 +245 @@
         case VERR_VMM_RING0_ASSERTION:
         case VINF_EM_DBG_HYPER_ASSERTION:
+        case VERR_VMM_RING3_CALL_DISABLED:
         {
             const char *pszMsg1 = VMMR3GetRZAssertMsg1(pVM);

trunk/src/VBox/VMM/VMMInternal.h

@@ -254 +254 @@
      * This may differ from cbRCLogger. */
     uint32_t                    cbRCRelLogger;
+    /** Whether log flushing has been disabled or not. */
+    bool                        fRCLoggerFlushingDisabled;
+    bool                        afAlignment[7]; /**< Alignment padding. */
     /** @} */
 
@@ -397 +400 @@
 #endif
 
-    /** @name CallHost
+    /** @name Call Ring-3
+     * Formerly known as host calls.
      * @{ */
+    /** The disable counter. */
+    uint32_t                    cCallRing3Disabled;
     /** The pending operation. */
     VMMCALLHOST                 enmCallHostOperation;
     /** The result of the last operation. */
     int32_t                     rcCallHost;
-#if HC_ARCH_BITS == 32
+#if HC_ARCH_BITS == 64
     uint32_t                    padding;
 #endif

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

@@ -314 +314 @@
  * @param   enmOperation    The operation.
  * @param   uArg            The argument to the operation.
+ *
+ * @deprecated Use VMMRZCallRing3.
  */
 VMMR0DECL(int) VMMR0CallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg)
 {
-    PVMCPU pVCpu = VMMGetCpu(pVM);
-
-/** @todo profile this! */
-    pVCpu->vmm.s.enmCallHostOperation = enmOperation;
-    pVCpu->vmm.s.u64CallHostArg = uArg;
-    pVCpu->vmm.s.rcCallHost = VERR_INTERNAL_ERROR;
-    int rc = vmmR0CallHostLongJmp(&pVCpu->vmm.s.CallHostR0JmpBuf, VINF_VMM_CALL_HOST);
-    if (rc == VINF_SUCCESS)
-        rc = pVCpu->vmm.s.rcCallHost;
-    return rc;
+    return VMMRZCallRing3(pVM, VMMGetCpu(pVM), enmOperation, uArg);
 }
 

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -903 +903 @@
     GEN_CHECK_OFF(VMM, pRCLoggerR3);
     GEN_CHECK_OFF(VMM, cbRCLogger);
+    GEN_CHECK_OFF(VMM, fRCLoggerFlushingDisabled);
     GEN_CHECK_OFF(VMM, pYieldTimer);
     GEN_CHECK_OFF(VMM, cYieldResumeMillies);
@@ -931 +932 @@
     GEN_CHECK_OFF(VMMCPU, pR0LoggerR3);
 #endif
+    GEN_CHECK_OFF(VMMCPU, cCallRing3Disabled);
     GEN_CHECK_OFF(VMMCPU, enmCallHostOperation);
     GEN_CHECK_OFF(VMMCPU, rcCallHost);