Changeset 22978 in vbox

Timestamp:

Sep 13, 2009 1:38:16 PM (15 years ago)

Author:

vboxsync

Message:

PDMAsyncCompletion: Fix crash on FreeBSD with failsafe manager. Need to advance to next task before freeing it. File sizes are only set during writes

Location:

trunk/src/VBox

Files:

• Devices/Storage/VDIHDDCore.cpp (modified) (1 diff)
• VMM/PDMAsyncCompletionFile.cpp (modified) (2 diffs)
• VMM/PDMAsyncCompletionFileFailsafe.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

@@ -521 +521 @@
     if (pImage->pInterfaceError)
         pImage->pInterfaceErrorCallbacks = VDGetInterfaceError(pImage->pInterfaceError);
+
+#ifdef VBOX_WITH_NEW_IO_CODE
+    /* Try to get async I/O interface. */
+    pImage->pInterfaceAsyncIO = VDInterfaceGet(pImage->pVDIfsDisk, VDINTERFACETYPE_ASYNCIO);
+    AssertPtr(pImage->pInterfaceAsyncIO);
+    pImage->pInterfaceAsyncIOCallbacks = VDGetInterfaceAsyncIO(pImage->pInterfaceAsyncIO);
+    AssertPtr(pImage->pInterfaceAsyncIOCallbacks);
+#endif
 
     vdiInitPreHeader(&pImage->PreHeader);

trunk/src/VBox/VMM/PDMAsyncCompletionFile.cpp

@@ -595 +595 @@
     if (RT_SUCCESS(rc))
     {
-        /* Initialize the segment cache */
-        rc = MMR3HeapAllocZEx(pEpClassFile->Core.pVM, MM_TAG_PDM_ASYNC_COMPLETION,
-                              sizeof(PDMACTASKFILE),
-                              (void **)&pEpFile->pTasksFreeHead);
+        rc = RTFileGetSize(pEpFile->File, (uint64_t *)&pEpFile->cbFile);
         if (RT_SUCCESS(rc))
         {
-            PPDMACEPFILEMGR pAioMgr = NULL;
-
-            pEpFile->pTasksFreeTail = pEpFile->pTasksFreeHead;
-            pEpFile->cTasksCached = 0;
-
-            if (pEpClassFile->fFailsafe)
+            /* Initialize the segment cache */
+            rc = MMR3HeapAllocZEx(pEpClassFile->Core.pVM, MM_TAG_PDM_ASYNC_COMPLETION,
+                                  sizeof(PDMACTASKFILE),
+                                  (void **)&pEpFile->pTasksFreeHead);
+            if (RT_SUCCESS(rc))
             {
-                /* Safe mode. Every file has its own async I/O manager. */
-                rc = pdmacFileAioMgrCreate(pEpClassFile, &pAioMgr);
-                AssertRC(rc);
-            }
-            else
-            {
-                if (fFlags & PDMACEP_FILE_FLAGS_CACHING)
+                PPDMACEPFILEMGR pAioMgr = NULL;
+
+                pEpFile->pTasksFreeTail = pEpFile->pTasksFreeHead;
+                pEpFile->cTasksCached = 0;
+
+                if (pEpClassFile->fFailsafe)
                 {
-                    pEpFile->fCaching = true;
-                    rc = pdmacFileEpCacheInit(pEpFile, pEpClassFile);
-                    if (RT_FAILURE(rc))
-                    {
-                        LogRel(("AIOMgr: Endpoint for \"%s\" was opened with caching but initializing cache failed. Disabled caching\n", pszUri));
-                        pEpFile->fCaching = false;
-                    }
-                }
-
-                /* Check for an idling one or create new if not found */
-                if (!pEpClassFile->pAioMgrHead)
-                {
+                    /* Safe mode. Every file has its own async I/O manager. */
                     rc = pdmacFileAioMgrCreate(pEpClassFile, &pAioMgr);
                     AssertRC(rc);
@@ -633 +617 @@
                 else
                 {
-                    pAioMgr = pEpClassFile->pAioMgrHead;
+                    if (fFlags & PDMACEP_FILE_FLAGS_CACHING)
+                    {
+                        pEpFile->fCaching = true;
+                        rc = pdmacFileEpCacheInit(pEpFile, pEpClassFile);
+                        if (RT_FAILURE(rc))
+                        {
+                            LogRel(("AIOMgr: Endpoint for \"%s\" was opened with caching but initializing cache failed. Disabled caching\n", pszUri));
+                            pEpFile->fCaching = false;
+                        }
+                    }
+
+                    /* Check for an idling one or create new if not found */
+                    if (!pEpClassFile->pAioMgrHead)
+                    {
+                        rc = pdmacFileAioMgrCreate(pEpClassFile, &pAioMgr);
+                        AssertRC(rc);
+                    }
+                    else
+                    {
+                        pAioMgr = pEpClassFile->pAioMgrHead;
+                    }
                 }
+
+                pEpFile->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_ACTIVE;
+
+                /* Assign the endpoint to the thread. */
+                rc = pdmacFileAioMgrAddEndpoint(pAioMgr, pEpFile);
+                if (RT_FAILURE(rc))
+                    MMR3HeapFree(pEpFile->pTasksFreeHead);
             }
-
-            pEpFile->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_ACTIVE;
-
-            /* Assign the endpoint to the thread. */
-            rc = pdmacFileAioMgrAddEndpoint(pAioMgr, pEpFile);
-            if (RT_FAILURE(rc))
-                MMR3HeapFree(pEpFile->pTasksFreeHead);
         }
 

trunk/src/VBox/VMM/PDMAsyncCompletionFileFailsafe.cpp

@@ -35 +35 @@
         PPDMACTASKFILE pCurr = pTasks;
 
+        pTasks = pTasks->pNext;
+
         switch (pCurr->enmTransferType)
         {
@@ -47 +49 @@
                 if (pCurr->enmTransferType == PDMACTASKFILETRANSFER_READ)
                 {
-                    if (RT_UNLIKELY((pCurr->Off + pCurr->DataSeg.cbSeg) > pEndpoint->cbFile))
-                    {
-                        ASMAtomicWriteU64(&pEndpoint->cbFile, pCurr->Off + pCurr->DataSeg.cbSeg);
-                        RTFileSetSize(pEndpoint->File, pCurr->Off + pCurr->DataSeg.cbSeg);
-                    }
-
                     rc = RTFileReadAt(pEndpoint->File, pCurr->Off,
                                       pCurr->DataSeg.pvSeg,
@@ -60 +56 @@
                 else
                 {
+                    if (RT_UNLIKELY((pCurr->Off + pCurr->DataSeg.cbSeg) > pEndpoint->cbFile))
+                    {
+                        ASMAtomicWriteU64(&pEndpoint->cbFile, pCurr->Off + pCurr->DataSeg.cbSeg);
+                        RTFileSetSize(pEndpoint->File, pCurr->Off + pCurr->DataSeg.cbSeg);
+                    }
+
                     rc = RTFileWriteAt(pEndpoint->File, pCurr->Off,
                                        pCurr->DataSeg.pvSeg,
@@ -76 +78 @@
         pCurr->pfnCompleted(pCurr, pCurr->pvUser);
         pdmacFileTaskFree(pEndpoint, pCurr);
-
-        pTasks = pTasks->pNext;
     }