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

Timestamp:

Apr 1, 2020 7:18:42 AM (5 years ago)

Author:

vboxsync

Message:

Network/DevVirtioNet_1_0.cpp: Round trip traffic happening continuously with network activity, but pings are not resolving yet. Need to dig into higher level packet traces, and validate thing like checksumming, etc...

File:

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

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

@@ -766 +766 @@
     uint16_t uAvailRingIdx = virtioReadAvailRingIdx(pDevIns, pVirtio, idxQueue);
     uint16_t uNextAvailIdx = pVirtio->virtqState[idxQueue].uAvailIdx;
-    int16_t  iDelta = uAvailRingIdx - uNextAvailIdx;
     uint16_t uDelta = uAvailRingIdx - uNextAvailIdx;
-    return iDelta >= 0 ? uDelta : VIRTQ_MAX_CNT + uDelta;
+    if (uAvailRingIdx > uNextAvailIdx)
+        return uDelta;
+    return VIRTQ_MAX_CNT + uDelta;
 }
 /**
@@ -906 +907 @@
               VIRTQNAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue)));
 
-    /*
-     * Copy s/g buf (virtual memory) to guest phys mem (IN direction). This virtual memory
-     * block will be small (fixed portion of response header + sense buffer area or
-     * control commands or error return values)... The bulk of req data xfers to phys mem
-     * is handled by client */
+    /* Copy s/g buf (virtual memory) to guest phys mem (IN direction). */
 
     size_t cbCopy = 0, cbTotal = 0, cbRemain = 0;
@@ -937 +934 @@
     }
 
-
     /* If this write-ahead crosses threshold where the driver wants to get an event flag it */
     if (pVirtio->uDriverFeatures & VIRTIO_F_EVENT_IDX)
@@ -946 +942 @@
      * Place used buffer's descriptor in used ring but don't update used ring's slot index.
      * That will be done with a subsequent client call to virtioCoreQueueSync() */
-    virtioWriteUsedElem(pDevIns, pVirtio, idxQueue, pVirtq->uUsedIdx++, pDescChain->uHeadIdx, (uint32_t)cbCopy);
-
-    Log6Func((".... Copied %zu bytes in %d segs to %u byte buffer, residual=%zu\n",
-              cbTotal - cbRemain, pSgVirtReturn->cSegs, pDescChain->cbPhysReturn, pDescChain->cbPhysReturn - cbCopy));
+    virtioWriteUsedElem(pDevIns, pVirtio, idxQueue, pVirtq->uUsedIdx++, pDescChain->uHeadIdx, (uint32_t)cbTotal);
+
+    if (pSgVirtReturn)
+        Log6Func((".... Copied %zu bytes in %d segs to %u byte buffer, residual=%zu\n",
+              cbTotal - cbRemain, pSgVirtReturn->cSegs, pDescChain->cbPhysReturn, pDescChain->cbPhysReturn - cbTotal));
 
     Log6Func(("Write ahead used_idx=%u, %s used_idx=%u\n",
@@ -1069 +1066 @@
             return;
         }
-/* REMOVE THIS!!!!!!! DON'T INTEGRATE! EXPERIMENTAL/DEBUG */
-//virtioKick(pDevIns, pVirtio, VIRTIO_ISR_VIRTQ_INTERRUPT, pVirtio->uQueueMsixVector[idxQueue], fForce);
-//        Log6Func(("...skipping interrupt. Guest flagged VIRTQ_AVAIL_F_NO_INTERRUPT for queue\n"));
+
+        Log6Func(("...skipping interrupt. Guest flagged VIRTQ_AVAIL_F_NO_INTERRUPT for queue\n"));
     }
 }