Changeset 26689 in vbox for trunk

Timestamp:

Feb 22, 2010 10:11:38 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Do not use TM to refresh the bandwidth limit. Expired timers are not executed during suspend leading to a hang because of insufficient bandwidth. Let the I/O managers update them instead

Location:

trunk/src/VBox/VMM

Files:

• PDMAsyncCompletionFile.cpp (modified) (6 diffs)
• PDMAsyncCompletionFileInternal.h (modified) (1 diff)
• PDMAsyncCompletionFileNormal.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDMAsyncCompletionFile.cpp

@@ -464 +464 @@
 
 /**
- * I/O refresh timer callback.
- */
-static void pdmacFileBwRefresh(PVM pVM, PTMTIMER pTimer, void *pvUser)
-{
-    PPDMACFILEBWMGR pBwMgr = (PPDMACFILEBWMGR)pvUser;
-
-    LogFlowFunc(("pVM=%p pTimer=%p pvUser=%p\n", pVM, pTimer, pvUser));
-
-    /* Reset the counter growing the maximum if allowed and needed */
-    bool fIncreaseNeeded = ASMAtomicReadBool(&pBwMgr->fVMTransferLimitReached);
-
-    if (   fIncreaseNeeded
-        && pBwMgr->cbVMTransferPerSecStart < pBwMgr->cbVMTransferPerSecMax)
-    {
-       pBwMgr->cbVMTransferPerSecStart = RT_MIN(pBwMgr->cbVMTransferPerSecMax, pBwMgr->cbVMTransferPerSecStart + pBwMgr->cbVMTransferPerSecStep);
-       LogFlow(("AIOMgr: Increasing maximum bandwidth to %u bytes/sec\n", pBwMgr->cbVMTransferPerSecStart));
-    }
-
-    /* Update */
-    ASMAtomicWriteU32(&pBwMgr->cbVMTransferAllowed, pBwMgr->cbVMTransferPerSecStart);
-    ASMAtomicWriteBool(&pBwMgr->fVMTransferLimitReached, false);
-
-    /* Arm the timer */
-    TMTimerSetMillies(pTimer, 1000);
-}
-
-/**
  * Destroys a async I/O manager.
  *
@@ -549 +522 @@
 
         pBwMgr->cbVMTransferAllowed = pBwMgr->cbVMTransferPerSecStart;
-
-        /* Init the refresh timer */
-        rc = TMR3TimerCreateInternal(pEpClassFile->Core.pVM,
-                                     TMCLOCK_REAL,
-                                     pdmacFileBwRefresh,
-                                     pBwMgr,
-                                     "AsyncCompletionFile-BW-Refresh",
-                                     &pBwMgr->pBwRefreshTimer);
-        if (RT_SUCCESS(rc))
-            *ppBwMgr = pBwMgr;
-        else
-            MMR3HeapFree(pBwMgr);
+        pBwMgr->tsUpdatedLast       = RTTimeSystemNanoTS();
+
+        *ppBwMgr = pBwMgr;
     }
 
@@ -568 +532 @@
 static void pdmacFileBwMgrDestroy(PPDMACFILEBWMGR pBwMgr)
 {
-    TMR3TimerDestroy(pBwMgr->pBwRefreshTimer);
     MMR3HeapFree(pBwMgr);
 }
@@ -575 +538 @@
 {
     pBwMgr->cRefs++;
-    if (pBwMgr->cRefs == 1)
-        TMTimerSetMillies(pBwMgr->pBwRefreshTimer, 1000); /* 1sec update interval */
 }
 
@@ -583 +544 @@
     Assert(pBwMgr->cRefs > 0);
     pBwMgr->cRefs--;
-    if (!pBwMgr->cRefs)
-        TMTimerStop(pBwMgr->pBwRefreshTimer);
 }
 
@@ -598 +557 @@
     else
     {
-        /* We are out of ressources */
-        ASMAtomicAddU32(&pBwMgr->cbVMTransferAllowed, cbTransfer);
-        ASMAtomicXchgBool(&pBwMgr->fVMTransferLimitReached, true);
+        /* We are out of ressources  Check if we can update again. */
+        uint64_t tsNow          = RTTimeSystemNanoTS();
+        uint64_t tsUpdatedLast  = ASMAtomicUoReadU64(&pBwMgr->tsUpdatedLast);
+
+        if (tsNow - tsUpdatedLast >= (1000*1000*1000))
+        {
+            if (ASMAtomicCmpXchgU64(&pBwMgr->tsUpdatedLast, tsNow, tsUpdatedLast))
+            {
+                if (pBwMgr->cbVMTransferPerSecStart < pBwMgr->cbVMTransferPerSecMax)
+                {
+                   pBwMgr->cbVMTransferPerSecStart = RT_MIN(pBwMgr->cbVMTransferPerSecMax, pBwMgr->cbVMTransferPerSecStart + pBwMgr->cbVMTransferPerSecStep);
+                   LogFlow(("AIOMgr: Increasing maximum bandwidth to %u bytes/sec\n", pBwMgr->cbVMTransferPerSecStart));
+                }
+
+                /* Update */
+                ASMAtomicWriteU32(&pBwMgr->cbVMTransferAllowed, pBwMgr->cbVMTransferPerSecStart - cbTransfer);
+                fAllowed = true;
+                LogFlow(("AIOMgr: Refreshed bandwidth\n"));
+            }
+        }
+        else
+            ASMAtomicAddU32(&pBwMgr->cbVMTransferAllowed, cbTransfer);
     }
 

trunk/src/VBox/VMM/PDMAsyncCompletionFileInternal.h

@@ -204 +204 @@
      * Resetted by the refresh timer. */
     volatile uint32_t cbVMTransferAllowed;
-    /** Flag whether a request could not processed due to the limit. */
-    volatile bool     fVMTransferLimitReached;
+    /** Timestamp of the last update */
+    volatile uint64_t tsUpdatedLast;
     /** Reference counter - How many endpoints are associated with this manager. */
     uint32_t          cRefs;
-    /** The refresh timer */
-    PTMTIMERR3        pBwRefreshTimer;
 } PDMACFILEBWMGR;
 /** Pointer to a bandwidth control manager */

trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp

@@ -1026 +1026 @@
         pAioMgr->iFreeEntryNext = (pAioMgr->iFreeEntryNext + 1) % pAioMgr->cReqEntries;
 
+        /* Free the lock and process pending tasks if neccessary */
+        pdmacFileAioMgrNormalRangeLockFree(pAioMgr, pEndpoint, pTask->pRangeLock);
+
         pAioMgr->cRequestsActive--;
         pEndpoint->AioMgr.cRequestsActive--;