Changeset 23959 in vbox

Timestamp:

Oct 22, 2009 8:38:31 AM (15 years ago)

Author:

vboxsync

Message:

PDMAsyncCompletion: Disable async I/O on linux if opening fails because it needs O_DIRECT too. Disable async I/O and enable the host cache if a request fails and the endpoint is migrated to a failsafe manager

Location:

trunk/src/VBox/VMM

Files:

• PDMAsyncCompletionFile.cpp (modified) (3 diffs)
• PDMAsyncCompletionFileNormal.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletionFile.cpp

@@ -555 +555 @@
     PPDMASYNCCOMPLETIONENDPOINTFILE pEpFile = (PPDMASYNCCOMPLETIONENDPOINTFILE)pEndpoint;
     PPDMASYNCCOMPLETIONEPCLASSFILE pEpClassFile = (PPDMASYNCCOMPLETIONEPCLASSFILE)pEndpoint->pEpClass;
+    bool fUseFailsafeManager = pEpClassFile->fFailsafe;
 
     AssertMsgReturn((fFlags & ~(PDMACEP_FILE_FLAGS_READ_ONLY | PDMACEP_FILE_FLAGS_CACHING)) == 0,
@@ -610 +611 @@
          *
          * On Linux we have the same problem with cifs.
-         * Shouldn't be a big problem here either because
-         * it's a network filesystem and the data is on another
-         * computer.
+         * Have to disable async I/O here too because it requires O_DIRECT.
          */
         fFileFlags &= ~RTFILE_O_NO_CACHE;
+
+#ifdef RT_OS_LINUX
+        fFileFlags &= ~RTFILE_O_ASYNC_IO;
+        fUseFailsafeManager = true;
+#endif
 
         /* Open again. */
@@ -644 +648 @@
                 pEpFile->cTasksCached = 0;
 
-                if (pEpClassFile->fFailsafe)
+                if (fUseFailsafeManager)
                 {
                     /* Safe mode. Every file has its own async I/O manager. */
-                    rc = pdmacFileAioMgrCreate(pEpClassFile, &pAioMgr, false);
+                    rc = pdmacFileAioMgrCreate(pEpClassFile, &pAioMgr, true);
                     AssertRC(rc);
                 }

trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp

@@ -880 +880 @@
                             PPDMACEPFILEMGR pAioMgrFailsafe;
 
+                            LogRel(("%s: Request %#p failed with rc=%Rrc, migrating endpoint %s to failsafe manager.\n",
+                                    RTThreadGetName(pAioMgr->Thread), pTask, rcReq, pEndpoint->Core.pszUri)); 
+
                             pEndpoint->AioMgr.fMoving = true;
 
@@ -887 +890 @@
 
                             pEndpoint->AioMgr.pAioMgrDst = pAioMgrFailsafe;
+
+                            /* Update the flags to open the file with. Disable async I/O and enable the host cache. */
+                            pEndpoint->fFlags &= ~(RTFILE_O_ASYNC_IO | RTFILE_O_NO_CACHE);
                         }
 
@@ -974 +980 @@
                             else if (RT_UNLIKELY(!pEndpoint->AioMgr.cRequestsActive && pEndpoint->AioMgr.fMoving))
                             {
-                                /* If we the endpoint is about to be migrated do it now. */
+                                /* If the endpoint is about to be migrated do it now. */
                                 bool fReqsPending = pdmacFileAioMgrNormalRemoveEndpoint(pEndpoint);
                                 Assert(!fReqsPending);