Changeset 83165 in vbox

Timestamp:

Feb 26, 2020 8:47:09 PM (5 years ago)

Author:

vboxsync

Message:

Network/DevVirtioNet.cpp Found some issues after going back and studying the initial port of the code, and got ping to work, so integrating that. More to test.

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (9 diffs)
• VirtIO/Virtio_1_0.cpp (modified) (8 diffs)

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

@@ -77 +77 @@
 #define VIRTQNAME(idxQueue)           (pThis->aszVirtqNames[idxQueue])
 #define CBVIRTQNAME(idxQueue)         RTStrNLen(VIRTQNAME(idxQueue), sizeof(VIRTQNAME(idxQueue)))
-#define FEATURE_ENABLED(feature)  (pThis->fNegotiatedFeatures & VIRTIONET_F_##feature)
+#define FEATURE_ENABLED(feature)  (!!(pThis->fNegotiatedFeatures & VIRTIONET_F_##feature))
 #define FEATURE_DISABLED(feature) (!FEATURE_ENABLED(feature))
 #define FEATURE_OFFERED(feature)  VIRTIONET_HOST_FEATURES_OFFERED & VIRTIONET_F_##feature
@@ -209 +209 @@
 /* Device operation: Net header packet (VirtIO 1.0, 5.1.6) */
 #pragma pack(1)
-struct virtio_net_hdr {
+struct virtio_net_pkt_hdr {
     uint8_t  uFlags;                                           /**< flags                                           */
     uint8_t  uGsoType;                                         /**< gso_type                                        */
@@ -219 +219 @@
 };
 #pragma pack()
-typedef virtio_net_hdr VIRTIONET_PKT_HDR_T, *PVIRTIONET_PKT_HDR_T;
+typedef virtio_net_pkt_hdr VIRTIONET_PKT_HDR_T, *PVIRTIONET_PKT_HDR_T;
 AssertCompileSize(VIRTIONET_PKT_HDR_T, 12);
 
@@ -1354 +1354 @@
     RT_NOREF(pThisCC);
 
-    LogFunc(("%s (%RTmac)\n", INSTANCE(pThis), pvBuf));
+    LogFunc(("%s (%RTmac) pGso %s\n", INSTANCE(pThis), pvBuf, pGso ? "present" : "not present"));
     VIRTIONET_PKT_HDR_T rxPktHdr;
 
@@ -1402 +1402 @@
     uint32_t cDescs = 0;
 
-    uint8_t fAddPktHdr = true;
-    uint32_t uOffset = 0;
-
-    while (uOffset < cb)
-    {
+    uint8_t fAddPktHdr = !!FEATURE_ENABLED(MRG_RXBUF);
+
+    uint32_t uOffset;
+    for (uOffset = 0; uOffset < cb; )
+    {
+        /* Pull the next empty Guest Rx buffer from the  queue */
+
         PVIRTIO_DESC_CHAIN_T pDescChain;
         int rc = virtioCoreR3QueueGet(pDevIns, &pThis->Virtio, RXQIDX_QPAIR(idxQueue), &pDescChain, true);
@@ -1418 +1420 @@
                         VERR_INTERNAL_ERROR);
 
-        /* Unlikely that len of 1st seg of guest Rx (IN) buf is less than sizeof(virtio_net_hdr) == 12.
+        /* Unlikely that len of 1st seg of guest Rx (IN) buf is less than sizeof(virtio_net_pkt_hdr) == 12.
          * Assert it to reduce complexity. Robust solution would entail finding seg idx and offset of
          * virtio_net_header.num_buffers (to update field *after* hdr & pkts copied to gcPhys) */
@@ -1426 +1428 @@
                         VERR_INTERNAL_ERROR);
 
-        uint32_t cbDescChainLeft = pDescChain->cbPhysSend;
-
-        uint16_t cSegs = 0;
-        if (fAddPktHdr)
+        uint32_t cbDescChainLeft = pDescChain->cbPhysReturn;
+
+        /* Fill the Guest Rx buffer with data received from the interface */
+        for (uint16_t cSegs = 0; uOffset < cb && cbDescChainLeft; cSegs++)
         {
-LogFunc(("Add pkthdr\n"));
-            /* Lead with packet header */
-            paVirtSegsToGuest[cSegs].cbSeg = sizeof(VIRTIONET_PKT_HDR_T);
-            paVirtSegsToGuest[cSegs].pvSeg = RTMemAlloc(sizeof(VIRTIONET_PKT_HDR_T));
-            AssertReturn(paVirtSegsToGuest[0].pvSeg, VERR_NO_MEMORY);
-
-            cbDescChainLeft -= sizeof(VIRTIONET_PKT_HDR_T);
-
-            memcpy(paVirtSegsToGuest[cSegs].pvSeg, &rxPktHdr, sizeof(VIRTIONET_PKT_HDR_T));
-
-            /* Calculate & cache the field we will need to update later in gcPhys memory */
-            gcPhysPktHdrNumBuffers = pDescChain->pSgPhysReturn->paSegs[0].gcPhys
-                                     + RT_UOFFSETOF(VIRTIONET_PKT_HDR_T, uNumBuffers);
-
-            fAddPktHdr = false;
+            if (fAddPktHdr)
+            {
+                /* Lead with packet header */
+                paVirtSegsToGuest[0].cbSeg = sizeof(VIRTIONET_PKT_HDR_T);
+                paVirtSegsToGuest[0].pvSeg = RTMemAlloc(sizeof(VIRTIONET_PKT_HDR_T));
+                AssertReturn(paVirtSegsToGuest[0].pvSeg, VERR_NO_MEMORY);
+                cbDescChainLeft -= sizeof(VIRTIONET_PKT_HDR_T);
+
+                memcpy(paVirtSegsToGuest[0].pvSeg, &rxPktHdr, sizeof(VIRTIONET_PKT_HDR_T));
+
+                /* Calculate & cache the field we will need to update later in gcPhys memory */
+                gcPhysPktHdrNumBuffers = pDescChain->pSgPhysReturn->paSegs[0].gcPhys
+                                         + RT_UOFFSETOF(VIRTIONET_PKT_HDR_T, uNumBuffers);
+                fAddPktHdr = false;
+                cSegs++;
+            }
+            if (cSegs >= cSegsAllocated)
+            {
+                cSegsAllocated <<= 1; /* double the allocation size */
+                paVirtSegsToGuest = (PRTSGSEG)RTMemRealloc(paVirtSegsToGuest, sizeof(RTSGSEG) * cSegsAllocated);
+                AssertReturn(paVirtSegsToGuest, VERR_NO_MEMORY);
+            }
+
+            /* Append remaining Rx pkt or as much current desc chain has room for */
+            uint32_t cbCropped = RT_MIN(cb, cbDescChainLeft);
+            paVirtSegsToGuest[cSegs].cbSeg = cbCropped;
+            paVirtSegsToGuest[cSegs].pvSeg = ((uint8_t *)pvBuf) + uOffset;
+            cbDescChainLeft -= cbCropped;
+            uOffset += cbCropped;
+            cDescs++;
+            RTSgBufInit(pVirtSegBufToGuest, paVirtSegsToGuest, cSegs + 1);
+            Log7Func(("Send Rx pkt to guest...\n"));
+            virtioCoreR3QueuePut(pDevIns, &pThis->Virtio, RXQIDX_QPAIR(idxQueue),
+                                 pVirtSegBufToGuest, pDescChain, true);
+
+            if (FEATURE_DISABLED(MRG_RXBUF))
+                break;
         }
-        if (cSegs++ >= cSegsAllocated)
-        {
-            cSegsAllocated <<= 1; /* double the allocation size */
-            paVirtSegsToGuest = (PRTSGSEG)RTMemRealloc(paVirtSegsToGuest, sizeof(RTSGSEG) * cSegsAllocated);
-            AssertReturn(paVirtSegsToGuest, VERR_NO_MEMORY);
-        }
-LogFunc(("Add new post-hdr segment\n"));
-
-        /* Append remaining Rx pkt or as much current desc chain has room for */
-        uint32_t cbLim = RT_MIN(cb, cbDescChainLeft);
-        paVirtSegsToGuest[cSegs].cbSeg = cbLim;
-        paVirtSegsToGuest[cSegs++].pvSeg = ((uint8_t *)pvBuf) + uOffset;
-        uOffset += cbLim;
-        cDescs++;
-
-        RTSgBufInit(pVirtSegBufToGuest, paVirtSegsToGuest, cSegs);
-//if (pThis->fLog)
-//    RT_BREAKPOINT();
-        Log7Func(("Send Rx pkt to guest...\n"));
-        virtioCoreR3QueuePut(pDevIns, &pThis->Virtio, RXQIDX_QPAIR(idxQueue),
-                             pVirtSegBufToGuest, pDescChain, true);
-
-        if (FEATURE_DISABLED(MRG_RXBUF))
-            break;
     }
 
@@ -1481 +1481 @@
 
     virtioCoreQueueSync(pDevIns, &pThis->Virtio, RXQIDX_QPAIR(idxQueue));
-
-//    for (int i = 0; i < cSegs; i++)
-//        RTMemFree(paVirtSegsToGuest[i].pvSeg);
 
     RTMemFree(paVirtSegsToGuest);
@@ -2447 +2444 @@
         pThisCC->fQuiescing  = false;
         pThis->fNegotiatedFeatures = virtioCoreGetAcceptedFeatures(pVirtio);
+
         for (unsigned idxQueue = 0; idxQueue < pThis->cVirtQueues; idxQueue++)
         {

trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp

@@ -556 +556 @@
     if (pVirtio->uDeviceStatus & VIRTIO_STATUS_DRIVER_OK)
         return virtqIsEmpty(pDevIns, pVirtio, idxQueue);
+    LogFunc(("VirtIO not ready: Returning 'true' for queue empty\n"));
     return true;
 }
@@ -582 +583 @@
     uint16_t uDescIdx = uHeadIdx;
 
-    Log3Func(("%s DESC CHAIN: (head) desc_idx=%u\n", pVirtq->szVirtqName, uHeadIdx));
+    Log6Func(("%s DESC CHAIN: (head) desc_idx=%u\n", pVirtq->szVirtqName, uHeadIdx));
     RT_NOREF(pVirtq);
 
@@ -618 +619 @@
         if (desc.fFlags & VIRTQ_DESC_F_WRITE)
         {
-            Log3Func(("%s IN  desc_idx=%u seg=%u addr=%RGp cb=%u\n", VIRTQNAME(pVirtio, idxQueue), uDescIdx, cSegsIn, desc.GCPhysBuf, desc.cb));
+            Log6Func(("%s IN  desc_idx=%u seg=%u addr=%RGp cb=%u\n", VIRTQNAME(pVirtio, idxQueue), uDescIdx, cSegsIn, desc.GCPhysBuf, desc.cb));
             cbIn += desc.cb;
             pSeg = &(paSegsIn[cSegsIn++]);
@@ -624 +625 @@
         else
         {
-            Log3Func(("%s OUT desc_idx=%u seg=%u addr=%RGp cb=%u\n", VIRTQNAME(pVirtio, idxQueue), uDescIdx, cSegsOut, desc.GCPhysBuf, desc.cb));
+            Log6Func(("%s OUT desc_idx=%u seg=%u addr=%RGp cb=%u\n", VIRTQNAME(pVirtio, idxQueue), uDescIdx, cSegsOut, desc.GCPhysBuf, desc.cb));
             cbOut += desc.cb;
             pSeg = &(paSegsOut[cSegsOut++]);
@@ -635 +636 @@
     } while (desc.fFlags & VIRTQ_DESC_F_NEXT);
 
-    PVIRTIOSGBUF pSgPhysIn = (PVIRTIOSGBUF)RTMemAllocZ(sizeof(VIRTIOSGBUF));
-    AssertReturn(pSgPhysIn, VERR_NO_MEMORY);
-
-    virtioCoreSgBufInit(pSgPhysIn, paSegsIn, cSegsIn);
-
-    PVIRTIOSGBUF pSgPhysOut = (PVIRTIOSGBUF)RTMemAllocZ(sizeof(VIRTIOSGBUF));
-    AssertReturn(pSgPhysOut, VERR_NO_MEMORY);
-
-    virtioCoreSgBufInit(pSgPhysOut, paSegsOut, cSegsOut);
-
     PVIRTIO_DESC_CHAIN_T pDescChain = (PVIRTIO_DESC_CHAIN_T)RTMemAllocZ(sizeof(VIRTIO_DESC_CHAIN_T));
     AssertReturn(pDescChain, VERR_NO_MEMORY);
 
     pDescChain->uHeadIdx      = uHeadIdx;
-    pDescChain->cbPhysSend    = cbOut;
-    pDescChain->pSgPhysSend   = pSgPhysOut;
-    pDescChain->cbPhysReturn  = cbIn;
-    pDescChain->pSgPhysReturn = pSgPhysIn;
     *ppDescChain = pDescChain;
 
-    Log3Func(("%s -- segs OUT: %u (%u bytes)   IN: %u (%u bytes) --\n", pVirtq->szVirtqName, cSegsOut, cbOut, cSegsIn, cbIn));
+    if (cSegsIn)
+    {
+        PVIRTIOSGBUF pSgPhysIn = (PVIRTIOSGBUF)RTMemAllocZ(sizeof(VIRTIOSGBUF));
+        AssertReturn(pSgPhysIn, VERR_NO_MEMORY);
+
+        virtioCoreSgBufInit(pSgPhysIn, paSegsIn, cSegsIn);
+        pDescChain->pSgPhysReturn = pSgPhysIn;
+        pDescChain->cbPhysReturn  = cbIn;
+    }
+
+    if (cSegsOut)
+    {
+        PVIRTIOSGBUF pSgPhysOut = (PVIRTIOSGBUF)RTMemAllocZ(sizeof(VIRTIOSGBUF));
+        AssertReturn(pSgPhysOut, VERR_NO_MEMORY);
+
+        virtioCoreSgBufInit(pSgPhysOut, paSegsOut, cSegsOut);
+        pDescChain->pSgPhysSend   = pSgPhysOut;
+        pDescChain->cbPhysSend    = cbOut;
+    }
+
+
+    Log6Func(("%s -- segs OUT: %u (%u bytes)   IN: %u (%u bytes) --\n", pVirtq->szVirtqName, cSegsOut, cbOut, cSegsIn, cbIn));
 
     return VINF_SUCCESS;
@@ -859 +867 @@
                     ("Guest driver not in ready state.\n"), VERR_INVALID_STATE);
 
-    Log3Func(("Copying client data to %s, desc chain (head desc_idx %d)\n",
+    Log6Func(("Copying client data to %s, desc chain (head desc_idx %d)\n",
               VIRTQNAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue)));
 
@@ -868 +876 @@
      * is handled by client */
 
-    size_t cbCopy = 0;
+    size_t cbCopy = 0, cbTotal, cbRemain;
 
     if (pSgVirtReturn)
     {
-        size_t cbRemain = RTSgBufCalcTotalLength(pSgVirtReturn);
+        cbRemain = cbTotal = RTSgBufCalcTotalLength(pSgVirtReturn);
         virtioCoreSgBufReset(pSgPhysReturn); /* Reset ptr because req data may have already been written */
         while (cbRemain)
@@ -904 +912 @@
     virtioWriteUsedElem(pDevIns, pVirtio, idxQueue, pVirtq->uUsedIdx++, pDescChain->uHeadIdx, (uint32_t)cbCopy);
 
-    Log3Func((".... Copied %zu bytes to %u byte buffer, residual=%zu\n",
-              cbCopy, pDescChain->cbPhysReturn, pDescChain->cbPhysReturn - cbCopy));
+    Log6Func((".... Copied %zu bytes in %d segs to %u byte buffer, residual=%zu\n",
+              cbTotal - cbRemain, pSgVirtReturn->cSegs, pDescChain->cbPhysReturn, pDescChain->cbPhysReturn - cbCopy));
 
     Log6Func(("Write ahead used_idx=%u, %s used_idx=%u\n",
               pVirtq->uUsedIdx, VIRTQNAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue)));
 
-    RTMemFree((void *)pDescChain->pSgPhysSend->paSegs);
-    RTMemFree(pDescChain->pSgPhysSend);
-    RTMemFree((void *)pSgPhysReturn->paSegs);
-    RTMemFree(pSgPhysReturn);
+    if (pDescChain->pSgPhysSend)
+    {
+        RTMemFree((void *)pDescChain->pSgPhysSend->paSegs);
+        RTMemFree(pDescChain->pSgPhysSend);
+    }
+    if (pDescChain->pSgPhysReturn)
+    {
+        RTMemFree((void *)pSgPhysReturn->paSegs);
+        RTMemFree(pSgPhysReturn);
+    }
     RTMemFree(pDescChain);