Changeset 94969 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

May 9, 2022 5:06:17 PM (3 years ago)

Author:

vboxsync

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

151379

Message:

Devices/Virtio|ai: Fixes and performance improvements for the 1.0 virtio-net implementation, bugref:8651

File:

• trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp (modified) (3 diffs)

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

@@ -1602 +1602 @@
              for (int i = 0; i < pWorkerR3->cRedoDescs; i++)
              {
+#ifdef VIRTIO_VBUF_ON_STACK
+                PVIRTQBUF pVirtqBuf = virtioCoreR3VirtqBufAlloc();
+                if (!pVirtqBuf)
+                {
+                    LogRel(("Failed to allocate memory for VIRTQBUF\n"));
+                    break;  /* No point in trying to allocate memory for other descriptor chains */
+                }
+                int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr,
+                                                    pWorkerR3->auRedoDescs[i], pVirtqBuf);
+#else /* !VIRTIO_VBUF_ON_STACK */
                   PVIRTQBUF pVirtqBuf;
                   int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr,
                                                         pWorkerR3->auRedoDescs[i], &pVirtqBuf);
+#endif /* !VIRTIO_VBUF_ON_STACK */
                   if (RT_FAILURE(rc))
                       LogRel(("Error fetching desc chain to redo, %Rrc", rc));
@@ -1617 +1628 @@
 
              Log6Func(("fetching next descriptor chain from %s\n", VIRTQNAME(uVirtqNbr)));
+#ifdef VIRTIO_VBUF_ON_STACK
+            PVIRTQBUF pVirtqBuf = virtioCoreR3VirtqBufAlloc();
+            if (!pVirtqBuf)
+                LogRel(("Failed to allocate memory for VIRTQBUF\n"));
+            else
+            {
+             int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr, pVirtqBuf, true);
+#else /* !VIRTIO_VBUF_ON_STACK */
              PVIRTQBUF pVirtqBuf = NULL;
              int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr, &pVirtqBuf, true);
+#endif /* !VIRTIO_VBUF_ON_STACK */
              if (rc == VERR_NOT_AVAILABLE)
              {
@@ -1636 +1656 @@
 
              virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
+#ifdef VIRTIO_VBUF_ON_STACK
+            }
+#endif /* VIRTIO_VBUF_ON_STACK */
         }
     }