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

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/Network/DevVirtioNet_1_0.cpp

@@ -1900 +1900 @@
     /* Cache address of uNumBuffers field of pkthdr to update ex post facto */
     RTGCPHYS GCPhysNumBuffers = pVirtqBuf->pSgPhysReturn->paSegs[0].GCPhys + RT_UOFFSETOF(VIRTIONETPKTHDR, uNumBuffers);
-    uint16_t cVirtqBufsUsed = 1;
+    uint16_t cVirtqBufsUsed = 0;
     cbBufRemaining -= cbPktHdr;
     /*
@@ -1915 +1915 @@
         ++cVirtqBufsUsed;
         cbBufRemaining -= cbBounded;
-        uPktOffset -= cbBounded;
+        uPktOffset += cbBounded;
         if (uPktOffset < cb)
         {
             cbHdrEnqueued = cbPktHdr;
+#ifdef VIRTIO_VBUF_ON_STACK
+            int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, pRxVirtq->uIdx, pVirtqBuf, true);
+#else /* !VIRTIO_VBUF_ON_STACK */
+            virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
             int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, pRxVirtq->uIdx, &pVirtqBuf, true);
+#endif /* !VIRTIO_VBUF_ON_STACK */
 
             AssertMsgReturn(rc == VINF_SUCCESS || rc == VERR_NOT_AVAILABLE, ("%Rrc\n", rc), rc);
 
+#ifdef VIRTIO_VBUF_ON_STACK
+            AssertMsgReturn(rc == VINF_SUCCESS && pVirtqBuf->cbPhysReturn,
+                            ("Not enough Rx buffers in queue to accomodate ethernet packet\n"),
+                            VERR_INTERNAL_ERROR);
+#else /* !VIRTIO_VBUF_ON_STACK */
             AssertMsgReturnStmt(rc == VINF_SUCCESS && pVirtqBuf->cbPhysReturn,
                                 ("Not enough Rx buffers in queue to accomodate ethernet packet\n"),
                                 virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf),
                                 VERR_INTERNAL_ERROR);
+#endif /* !VIRTIO_VBUF_ON_STACK */
+            cbBufRemaining = pVirtqBuf->cbPhysReturn;
         }
     }
@@ -1934 +1946 @@
     AssertMsgRCReturn(rc, ("Failure updating descriptor count in pkt hdr in guest physical memory\n"), rc);
 
+#ifndef VIRTIO_VBUF_ON_STACK
     virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
+#endif /* !VIRTIO_VBUF_ON_STACK */
     virtioCoreVirtqUsedRingSync(pDevIns, &pThis->Virtio, pRxVirtq->uIdx);
     Log7(("\n"));
@@ -1960 +1974 @@
 {
     RT_NOREF(pThisCC);
+#ifdef VIRTIO_VBUF_ON_STACK
+    VIRTQBUF_T VirtqBuf;
+    PVIRTQBUF pVirtqBuf = &VirtqBuf;
+    int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, pRxVirtq->uIdx, pVirtqBuf, true);
+#else /* !VIRTIO_VBUF_ON_STACK */
     PVIRTQBUF pVirtqBuf;
     int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, pRxVirtq->uIdx, &pVirtqBuf, true);
+#endif /* !VIRTIO_VBUF_ON_STACK */
 
     AssertMsgReturn(rc == VINF_SUCCESS || rc == VERR_NOT_AVAILABLE, ("%Rrc\n", rc), rc);
 
+#ifdef VIRTIO_VBUF_ON_STACK
+    AssertMsgReturn(rc == VINF_SUCCESS && pVirtqBuf->cbPhysReturn,
+                    ("Not enough Rx buffers or capacity to accommodate ethernet packet\n"),
+                    VERR_INTERNAL_ERROR);
+#else /* !VIRTIO_VBUF_ON_STACK */
     AssertMsgReturnStmt(rc == VINF_SUCCESS && pVirtqBuf->cbPhysReturn,
                         ("Not enough Rx buffers or capacity to accommodate ethernet packet\n"),
                         virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf),
                         VERR_INTERNAL_ERROR);
+#endif /* !VIRTIO_VBUF_ON_STACK */
     /*
      * Try to do fast (e.g. single-buffer) copy to guest, even if MRG_RXBUF feature is enabled
@@ -1981 +2007 @@
         if (rc == VINF_SUCCESS)
             rc = virtioCoreR3VirtqUsedBufPut(pDevIns, &pThis->Virtio, pRxVirtq->uIdx, cb, pvBuf, pVirtqBuf, cbPktHdr + cb /* cbEnqueue */);
+#ifndef VIRTIO_VBUF_ON_STACK
         virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
+#endif /* !VIRTIO_VBUF_ON_STACK */
         virtioCoreVirtqUsedRingSync(pDevIns, &pThis->Virtio, pRxVirtq->uIdx);
         AssertMsgReturn(rc == VINF_SUCCESS, ("%Rrc\n", rc), rc);
@@ -2674 +2702 @@
     virtioNetR3SetWriteLed(pThisCC, true);
 
+    /* Disable notifications until all available descriptors have been processed */
+    if (!(pVirtio->uDriverFeatures & VIRTIO_F_EVENT_IDX))
+        virtioCoreVirtqEnableNotify(&pThis->Virtio, pTxVirtq->uIdx, false /* fEnable */);
+
     int rc;
+#ifdef VIRTIO_VBUF_ON_STACK
+    VIRTQBUF_T VirtqBuf;
+    PVIRTQBUF pVirtqBuf = &VirtqBuf;
+    while ((rc = virtioCoreR3VirtqAvailBufPeek(pVirtio->pDevInsR3, pVirtio, pTxVirtq->uIdx, pVirtqBuf)) == VINF_SUCCESS)
+#else /* !VIRTIO_VBUF_ON_STACK */
     PVIRTQBUF pVirtqBuf = NULL;
     while ((rc = virtioCoreR3VirtqAvailBufPeek(pVirtio->pDevInsR3, pVirtio, pTxVirtq->uIdx, &pVirtqBuf)) == VINF_SUCCESS)
+#endif /* !VIRTIO_VBUF_ON_STACK */
     {
         Log10Func(("[%s] fetched descriptor chain from %s\n", pThis->szInst, pTxVirtq->szName));
@@ -2689 +2727 @@
                         VERR_INTERNAL_ERROR);
 
+#ifdef VIRTIO_VBUF_ON_STACK
+        VIRTIONETPKTHDR PktHdr;
+        PVIRTIONETPKTHDR pPktHdr = &PktHdr;
+#else /* !VIRTIO_VBUF_ON_STACK */
         PVIRTIONETPKTHDR pPktHdr = (PVIRTIONETPKTHDR)RTMemAllocZ(pThis->cbPktHdr);
         AssertMsgReturn(pPktHdr, ("Out of Memory\n"), VERR_NO_MEMORY);
+#endif /* !VIRTIO_VBUF_ON_STACK */
 
         /* Compute total frame size from guest (including virtio-net pkt hdr) */
@@ -2765 +2808 @@
                 Log4Func(("Failed to allocate S/G buffer: frame size=%u rc=%Rrc\n", uFrameSize, rc));
                 /* Stop trying to fetch TX descriptors until we get more bandwidth. */
+#ifndef VIRTIO_VBUF_ON_STACK
                 virtioCoreR3VirtqBufRelease(pVirtio, pVirtqBuf);
+#endif /* !VIRTIO_VBUF_ON_STACK */
                 break;
             }
@@ -2776 +2821 @@
         }
 
+#ifndef VIRTIO_VBUF_ON_STACK
         virtioCoreR3VirtqBufRelease(pVirtio, pVirtqBuf);
         pVirtqBuf = NULL;
+#endif /* !VIRTIO_VBUF_ON_STACK */
+        /* Before we break the loop we need to check if the queue is empty,
+         * re-enable notifications, and then re-check again to avoid missing
+         * a notification for the descriptor that is added to the queue
+         * after we have checked it on being empty, but before we re-enabled
+         * notifications.
+         */
+        if (!(pVirtio->uDriverFeatures & VIRTIO_F_EVENT_IDX)
+            && IS_VIRTQ_EMPTY(pDevIns, &pThis->Virtio, pTxVirtq->uIdx))
+            virtioCoreVirtqEnableNotify(&pThis->Virtio, pTxVirtq->uIdx, true /* fEnable */);
     }
     virtioNetR3SetWriteLed(pThisCC, false);
@@ -3108 +3164 @@
          {
              Log10Func(("[%s] %s worker woken. Fetching desc chain\n", pThis->szInst, pVirtq->szName));
+#ifdef VIRTIO_VBUF_ON_STACK
+            VIRTQBUF_T VirtqBuf;
+            PVIRTQBUF pVirtqBuf = &VirtqBuf;
+            int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, pVirtq->uIdx, pVirtqBuf, true);
+#else /* !VIRTIO_VBUF_ON_STACK */
              PVIRTQBUF pVirtqBuf = NULL;
              int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, pVirtq->uIdx, &pVirtqBuf, true);
+#endif /* !VIRTIO_VBUF_ON_STACK */
              if (rc == VERR_NOT_AVAILABLE)
              {
@@ -3116 +3178 @@
              }
              virtioNetR3Ctrl(pDevIns, pThis, pThisCC, pVirtqBuf);
+#ifndef VIRTIO_VBUF_ON_STACK
              virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
+#endif /* !VIRTIO_VBUF_ON_STACK */
          }
          else /* Must be Tx queue */