Changeset 59138 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 15, 2015 4:39:21 PM (9 years ago)

Author:

vboxsync

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

104712

Message:

VMM,VM: Allow EMT rendezvous from VMREQFLAGS_PRIORITY callbacks as the VM state will prevent really bad stuff from succeeding if we're actually in a async reset or suspend (the origin on the priority EMT requests), while making it stuff work just fine all the time we're not (like when out of memory).

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• VMM.cpp (modified) (11 diffs)
• VMReq.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -1875 +1875 @@
 {
     Assert(!pVCpu->vmm.s.fInRendezvous);
+    Log(("VMMR3EmtRendezvousFF: EMT%#u\n", pVCpu->idCpu));
     pVCpu->vmm.s.fInRendezvous = true;
     VBOXSTRICTRC rcStrict = vmmR3EmtRendezvousCommon(pVM, pVCpu, false /* fIsCaller */, pVM->vmm.s.fRendezvousFlags,
                                                      pVM->vmm.s.pfnRendezvous, pVM->vmm.s.pvRendezvousUser);
     pVCpu->vmm.s.fInRendezvous = false;
+    Log(("VMMR3EmtRendezvousFF: EMT%#u returns %Rrc\n", pVCpu->idCpu, VBOXSTRICTRC_VAL(rcStrict)));
     return VBOXSTRICTRC_TODO(rcStrict);
 }
@@ -1919 +1921 @@
                                                 PFNVMMEMTRENDEZVOUS pfnRendezvous, void *pvUser)
 {
+    Log(("vmmR3EmtRendezvousRecursive: %#x EMT#%u depth=%d\n", fFlags, pVCpu->idCpu, pVM->vmm.s.cRendezvousRecursions));
     AssertLogRelReturn(pVM->vmm.s.cRendezvousRecursions < 3, VERR_DEADLOCK);
+    Assert(pVCpu->vmm.s.fInRendezvous);
 
     /*
@@ -2102 +2106 @@
     ASMAtomicDecU32(&pVM->vmm.s.cRendezvousRecursions);
 
+    Log(("vmmR3EmtRendezvousRecursive: %#x EMT#%u depth=%d returns %Rrc\n",
+         fFlags, pVCpu->idCpu, pVM->vmm.s.cRendezvousRecursions, VBOXSTRICTRC_VAL(rcStrict)));
     return rcStrict;
 }
@@ -2148 +2154 @@
          * Forward the request to an EMT thread.
          */
+    {
+        Log(("VMMR3EmtRendezvous: %#x non-EMT\n", fFlags));
         rcStrict = VMR3ReqCallWait(pVM, VMCPUID_ANY,
                                    (PFNRT)VMMR3EmtRendezvous, 4, pVM, fFlags, pfnRendezvous, pvUser);
+        Log(("VMMR3EmtRendezvous: %#x non-EMT returns %Rrc\n", fFlags, VBOXSTRICTRC_VAL(rcStrict)));
+    }
     else if (pVM->cCpus == 1)
     {
@@ -2157 +2167 @@
         if (!pVCpu->vmm.s.fInRendezvous)
         {
+            Log(("VMMR3EmtRendezvous: %#x EMT (uni)\n", fFlags));
             pVCpu->vmm.s.fInRendezvous  = true;
             pVM->vmm.s.fRendezvousFlags = fFlags;
@@ -2165 +2176 @@
         {
             /* Recursion. Do the same checks as in the SMP case. */
+            Log(("VMMR3EmtRendezvous: %#x EMT (uni), recursion depth=%d\n", fFlags, pVM->vmm.s.cRendezvousRecursions));
             uint32_t fType = pVM->vmm.s.fRendezvousFlags & VMMEMTRENDEZVOUS_FLAGS_TYPE_MASK;
             AssertLogRelReturn(   !pVCpu->vmm.s.fInRendezvous
@@ -2183 +2195 @@
             pVM->vmm.s.cRendezvousRecursions--;
         }
+        Log(("VMMR3EmtRendezvous: %#x EMT (uni) returns %Rrc\n", fFlags, VBOXSTRICTRC_VAL(rcStrict)));
     }
     else
@@ -2206 +2219 @@
                                   VERR_DEADLOCK);
 
+            Log(("VMMR3EmtRendezvous: %#x EMT#%u, waiting for lock...\n", fFlags, pVCpu->idCpu));
             while (!ASMAtomicCmpXchgU32(&pVM->vmm.s.u32RendezvousLock, 0x77778888, 0))
             {
@@ -2220 +2234 @@
             }
         }
+
+        Log(("VMMR3EmtRendezvous: %#x EMT#%u\n", fFlags, pVCpu->idCpu));
         Assert(!VM_FF_IS_PENDING(pVM, VM_FF_EMT_RENDEZVOUS));
         Assert(!pVCpu->vmm.s.fInRendezvous);
@@ -2291 +2307 @@
                  || rcStrict > rcStrict3))
             rcStrict = rcStrict3;
+        Log(("VMMR3EmtRendezvous: %#x EMT#%u returns %Rrc\n", fFlags, pVCpu->idCpu, VBOXSTRICTRC_VAL(rcStrict)));
     }
 
@@ -2298 +2315 @@
                           VERR_IPE_UNEXPECTED_INFO_STATUS);
     return VBOXSTRICTRC_VAL(rcStrict);
-}
-
-
-/**
- * Disables/enables EMT rendezvous.
- *
- * This is used to make sure EMT rendezvous does not take place while
- * processing a priority request.
- *
- * @returns Old rendezvous-disabled state.
- * @param   pVCpu           The cross context virtual CPU structure of the calling EMT.
- * @param   fDisabled       True if disabled, false if enabled.
- */
-VMMR3_INT_DECL(bool) VMMR3EmtRendezvousSetDisabled(PVMCPU pVCpu, bool fDisabled)
-{
-    VMCPU_ASSERT_EMT(pVCpu);
-    bool fOld = pVCpu->vmm.s.fInRendezvous;
-    pVCpu->vmm.s.fInRendezvous = fDisabled;
-    return fOld;
 }
 

trunk/src/VBox/VMM/VMMR3/VMReq.cpp

@@ -1193 +1193 @@
 {
     LogFlow(("vmR3ReqProcessOneU: pReq=%p type=%d fFlags=%#x\n", pReq, pReq->enmType, pReq->fFlags));
-
-#if 1 /*def VBOX_STRICT */
-    /*
-     * Disable rendezvous if servicing a priority request.  Priority requests
-     * can not make use of the EMT rendezvous API.
-     */
-    PVMCPU      pVCpu               = NULL;
-    bool        fSavedInRendezvous  = true;
-    bool const  fPriorityReq        = RT_BOOL(pReq->fFlags & VMREQFLAGS_PRIORITY);
-    if (fPriorityReq && pUVM->pVM)
-    {
-        pVCpu = VMMGetCpu(pUVM->pVM);
-        fSavedInRendezvous = VMMR3EmtRendezvousSetDisabled(pVCpu, true /*fDisabled*/);
-    }
-#endif
 
     /*
@@ -1345 +1330 @@
     }
 
-#if 1 /*def VBOX_STRICT */
-    /*
-     * Restore the rendezvous disabled state.
-     */
-    if (!fSavedInRendezvous)
-        VMMR3EmtRendezvousSetDisabled(pVCpu, false /*fDisabled*/);
-#endif
     return rcRet;
 }