Changeset 97494 in vbox

Timestamp:

Nov 10, 2022 1:14:55 PM (2 years ago)

Author:

vboxsync

Message:

Storage/VD: Fall back to synchronous I/O even for async requests if the async I/O interface is not available. Fixes virtio-scsi failing with the host cache enabled because it will submit concurrent requests from different threads which means some of the synchronous requests get converted to asynchronous requests due to disk lock contention, ticketref:19717

Location:

trunk

Files:

• doc/manual/user_ChangeLogImpl.xml (modified) (1 diff)
• src/VBox/Storage/VD.cpp (modified) (7 diffs)

trunk/doc/manual/user_ChangeLogImpl.xml

@@ -104 +104 @@
 
       <listitem>
+        <para>Storage: Fixed I/O errors with the VirtioSCSI controller when the host I/O cache is enabled (bug #19717)</para>
+      </listitem>
+
+      <listitem>
         <para>3D: Fixed VM process crash on macOS with 3D enabled (bug #21232)</para>
       </listitem>

trunk/src/VBox/Storage/VD.cpp

@@ -3322 +3322 @@
 
 /**
- * VD async I/O interface callback for a asynchronous read from the file.
- */
-static DECLCALLBACK(int) vdIOReadAsyncFallback(void *pvUser, void *pStorage, uint64_t uOffset,
-                                               PCRTSGSEG paSegments, size_t cSegments,
-                                               size_t cbRead, void *pvCompletion,
-                                               void **ppTask)
-{
-    RT_NOREF8(pvUser, pStorage, uOffset, paSegments, cSegments, cbRead, pvCompletion, ppTask);
-    AssertFailed();
-    return VERR_NOT_IMPLEMENTED;
-}
-
-/**
- * VD async I/O interface callback for a asynchronous write to the file.
- */
-static DECLCALLBACK(int) vdIOWriteAsyncFallback(void *pvUser, void *pStorage, uint64_t uOffset,
-                                                PCRTSGSEG paSegments, size_t cSegments,
-                                                size_t cbWrite, void *pvCompletion,
-                                                void **ppTask)
-{
-    RT_NOREF8(pvUser, pStorage, uOffset, paSegments, cSegments, cbWrite, pvCompletion, ppTask);
-    AssertFailed();
-    return VERR_NOT_IMPLEMENTED;
-}
-
-/**
- * VD async I/O interface callback for a asynchronous flush of the file data.
- */
-static DECLCALLBACK(int) vdIOFlushAsyncFallback(void *pvUser, void *pStorage,
-                                                void *pvCompletion, void **ppTask)
-{
-    RT_NOREF4(pvUser, pStorage, pvCompletion, ppTask);
-    AssertFailed();
-    return VERR_NOT_IMPLEMENTED;
-}
-
-/**
  * Internal - Continues an I/O context after
  * it was halted because of an active transfer.
@@ -3996 +3959 @@
     Assert(cbRead > 0);
 
-    if (pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC)
+    if (   (pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC)
+        || !pVDIo->pInterfaceIo->pfnReadAsync)
     {
         RTSGSEG Seg;
@@ -4094 +4058 @@
     Assert(cbWrite > 0);
 
-    if (pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC)
+    if (   (pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC)
+        || !pVDIo->pInterfaceIo->pfnWriteAsync)
     {
         RTSGSEG Seg;
@@ -4204 +4169 @@
 
     if (   !pIoCtx
-        || pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC)
+        || pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC
+        || !pVDIo->pInterfaceIo->pfnReadAsync)
     {
         /* Handle synchronous metadata I/O. */
@@ -4326 +4292 @@
 
     if (   !pIoCtx
-        || pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC)
+        || pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC
+        || !pVDIo->pInterfaceIo->pfnWriteAsync)
     {
         /* Handle synchronous metadata I/O. */
@@ -4519 +4486 @@
 
     if (   !pIoCtx
-        || pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC)
+        || pIoCtx->fFlags & VDIOCTX_FLAGS_SYNC
+        || !pVDIo->pInterfaceIo->pfnFlushAsync)
     {
         /* Handle synchronous flushes. */
@@ -4983 +4951 @@
     pIfIo->pfnWriteSync           = vdIOWriteSyncFallback;
     pIfIo->pfnFlushSync           = vdIOFlushSyncFallback;
-    pIfIo->pfnReadAsync           = vdIOReadAsyncFallback;
-    pIfIo->pfnWriteAsync          = vdIOWriteAsyncFallback;
-    pIfIo->pfnFlushAsync          = vdIOFlushAsyncFallback;
+    pIfIo->pfnReadAsync           = NULL;
+    pIfIo->pfnWriteAsync          = NULL;
+    pIfIo->pfnFlushAsync          = NULL;
 }