Changeset 83165 in vbox for trunk/src/VBox/Devices/VirtIO

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.

File:

• trunk/src/VBox/Devices/VirtIO/Virtio_1_0.cpp (modified) (8 diffs)

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);