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

Timestamp:

Jun 19, 2020 6:17:29 AM (5 years ago)

Author:

vboxsync

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

138708

Message:

Network/DevVirtioNet_1_0.cpp: Fixed up comments/formatting that got stale over time and changes, and made more function and variable names more accurate to improve maintainability and code self-documentation

File:

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

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

@@ -74 +74 @@
 
 #define IS_VIRTQ_EMPTY(pDevIns, pVirtio, uVirtqNbr) \
-            (virtioCoreVirtqAvailCount(pDevIns, pVirtio, uVirtqNbr) == 0)
+            (virtioCoreVirtqAvailBufCount(pDevIns, pVirtio, uVirtqNbr) == 0)
 
 #define SET_LINK_UP(pState) \
@@ -218 +218 @@
 #pragma pack(1)
 struct virtio_net_pkt_hdr {
-    uint8_t  uFlags;                                           /**< flags                                           */
-    uint8_t  uGsoType;                                         /**< gso_type                                        */
-    uint16_t uHdrLen;                                          /**< hdr_len                                         */
-    uint16_t uGsoSize;                                         /**< gso_size                                        */
-    uint16_t uChksumStart;                                     /**< Chksum_start                                    */
-    uint16_t uChksumOffset;                                    /**< Chksum_offset                                   */
-    uint16_t uNumBuffers;                                      /**< num_buffers                                     */
+    uint8_t  uFlags;                                            /**< flags                                          */
+    uint8_t  uGsoType;                                          /**< gso_type                                       */
+    uint16_t uHdrLen;                                           /**< hdr_len                                        */
+    uint16_t uGsoSize;                                          /**< gso_size                                       */
+    uint16_t uChksumStart;                                      /**< Chksum_start                                   */
+    uint16_t uChksumOffset;                                     /**< Chksum_offset                                  */
+    uint16_t uNumBuffers;                                       /**< num_buffers                                    */
 };
 #pragma pack()
@@ -262 +262 @@
 /** @name Control virtq: MAC address filtering flags (VirtIO 1.0, 5.1.6.5.2)
  * @{  */
-#define VIRTIONET_CTRL_MAC                          1           /**< Control class: MAC address filtering            */
-#define VIRTIONET_CTRL_MAC_TABLE_SET                0           /**< Set MAC table                                   */
-#define VIRTIONET_CTRL_MAC_ADDR_SET                 1           /**< Set default MAC address                         */
+#define VIRTIONET_CTRL_MAC                          1           /**< Control class: MAC address filtering           */
+#define VIRTIONET_CTRL_MAC_TABLE_SET                0           /**< Set MAC table                                  */
+#define VIRTIONET_CTRL_MAC_ADDR_SET                 1           /**< Set default MAC address                        */
 /** @} */
 
 /** @name Control virtq: MAC address filtering flags (VirtIO 1.0, 5.1.6.5.3)
  * @{  */
-#define VIRTIONET_CTRL_VLAN                         2           /**< Control class: VLAN filtering                   */
-#define VIRTIONET_CTRL_VLAN_ADD                     0           /**< Add VLAN to filter table                        */
-#define VIRTIONET_CTRL_VLAN_DEL                     1           /**< Delete VLAN from filter table                   */
+#define VIRTIONET_CTRL_VLAN                         2           /**< Control class: VLAN filtering                  */
+#define VIRTIONET_CTRL_VLAN_ADD                     0           /**< Add VLAN to filter table                       */
+#define VIRTIONET_CTRL_VLAN_DEL                     1           /**< Delete VLAN from filter table                  */
 /** @} */
 
 /** @name Control virtq: Gratuitous packet sending (VirtIO 1.0, 5.1.6.5.4)
  * @{  */
-#define VIRTIONET_CTRL_ANNOUNCE                     3           /**< Control class: Gratuitous Packet Sending        */
-#define VIRTIONET_CTRL_ANNOUNCE_ACK                 0           /**< Gratuitous Packet Sending ACK                   */
+#define VIRTIONET_CTRL_ANNOUNCE                     3           /**< Control class: Gratuitous Packet Sending       */
+#define VIRTIONET_CTRL_ANNOUNCE_ACK                 0           /**< Gratuitous Packet Sending ACK                  */
 /** @} */
 
 struct virtio_net_ctrl_mq {
-    uint16_t    uVirtqueuePairs;                                /**<  virtqueue_pairs                                */
+    uint16_t    uVirtqueuePairs;                                /**<  virtqueue_pairs                               */
 };
 
 /** @name Control virtq: Receive steering in multiqueue mode (VirtIO 1.0, 5.1.6.5.5)
  * @{  */
-#define VIRTIONET_CTRL_MQ                           4           /**< Control class: Receive steering                 */
-#define VIRTIONET_CTRL_MQ_VQ_PAIRS_SET              0           /**< Set number of TX/RX queues                      */
-#define VIRTIONET_CTRL_MQ_VQ_PAIRS_MIN              1           /**< Minimum number of TX/RX queues                  */
-#define VIRTIONET_CTRL_MQ_VQ_PAIRS_MAX         0x8000           /**< Maximum number of TX/RX queues                  */
+#define VIRTIONET_CTRL_MQ                           4           /**< Control class: Receive steering                */
+#define VIRTIONET_CTRL_MQ_VQ_PAIRS_SET              0           /**< Set number of TX/RX queues                     */
+#define VIRTIONET_CTRL_MQ_VQ_PAIRS_MIN              1           /**< Minimum number of TX/RX queues                 */
+#define VIRTIONET_CTRL_MQ_VQ_PAIRS_MAX         0x8000           /**< Maximum number of TX/RX queues                 */
 /** @} */
 
-uint64_t    uOffloads;                                          /**< offloads                                        */
+uint64_t    uOffloads;                                          /**< offloads                                       */
 
 /** @name Control virtq: Setting Offloads State (VirtIO 1.0, 5.1.6.5.6.1)
  * @{  */
-#define VIRTIO_NET_CTRL_GUEST_OFFLOADS             5            /**< Control class: Offloads state configuration     */
-#define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET         0            /** Apply new offloads configuration                 */
+#define VIRTIO_NET_CTRL_GUEST_OFFLOADS             5            /**< Control class: Offloads state configuration    */
+#define VIRTIO_NET_CTRL_GUEST_OFFLOADS_SET         0            /** Apply new offloads configuration                */
 /** @} */
 
@@ -308 +308 @@
 typedef struct VIRTIONETVIRTQ
 {
-    struct VIRTIONETWORKER         *pWorker;                    /**< Pointer to R0 worker struct                      */
-    struct VIRTIONETWORKERR3       *pWorkerR3;                  /**< Pointer to R3 worker struct                      */
-    uint16_t                       idx;                         /**< Index of this queue                              */
+    struct VIRTIONETWORKER         *pWorker;                    /**< Pointer to R0 worker struct                    */
+    struct VIRTIONETWORKERR3       *pWorkerR3;                  /**< Pointer to R3 worker struct                    */
+    uint16_t                       idx;                         /**< Index of this queue                            */
     uint16_t                       align;
-    char                           szName[VIRTIO_MAX_VIRTQ_NAME_SIZE]; /**< Virtq name                                */
-    bool                           fCtlVirtq;                   /**< If set this queue is the control queue           */
-    bool                           fHasWorker;                  /**< If set this queue has an associated worker       */
-    bool                           fAttachedToVirtioCore;       /**< Set if queue attached to virtio core             */
+    char                           szName[VIRTIO_MAX_VIRTQ_NAME_SIZE]; /**< Virtq name                              */
+    bool                           fCtlVirtq;                   /**< If set this queue is the control queue         */
+    bool                           fHasWorker;                  /**< If set this queue has an associated worker     */
+    bool                           fAttachedToVirtioCore;       /**< Set if queue attached to virtio core           */
     uint8_t                        pad;
 } VIRTIONETVIRTQ, *PVIRTIONETVIRTQ;
@@ -324 +324 @@
 typedef struct VIRTIONETWORKER
 {
-    SUPSEMEVENT                     hEvtProcess;                /**< handle of associated sleep/wake-up semaphore      */
-    PVIRTIONETVIRTQ                 pVirtq;                     /**< pointer to queue                                  */
-    uint16_t                        idx;                        /**< Index of this worker                              */
-    bool volatile                   fSleeping;                  /**< Flags whether worker thread is sleeping or not    */
-    bool volatile                   fNotified;                  /**< Flags whether worker thread notified              */
-    bool                            fAssigned;                  /**< Flags whether worker thread has been set up       */
+    SUPSEMEVENT                     hEvtProcess;                /**< handle of associated sleep/wake-up semaphore   */
+    PVIRTIONETVIRTQ                 pVirtq;                     /**< pointer to queue                               */
+    uint16_t                        idx;                        /**< Index of this worker                           */
+    bool volatile                   fSleeping;                  /**< Flags whether worker thread is sleeping or not */
+    bool volatile                   fNotified;                  /**< Flags whether worker thread notified           */
+    bool                            fAssigned;                  /**< Flags whether worker thread has been set up    */
     uint8_t                         pad;
 } VIRTIONETWORKER;
@@ -340 +340 @@
 typedef struct VIRTIONETWORKERR3
 {
-    R3PTRTYPE(PPDMTHREAD)           pThread;                    /**< pointer to worker thread's handle                 */
-    PVIRTIONETVIRTQ                 pVirtq;                     /**< pointer to queue                                  */
-    uint16_t                        idx;                        /**< Index of this worker                              */
+    R3PTRTYPE(PPDMTHREAD)           pThread;                    /**< pointer to worker thread's handle              */
+    PVIRTIONETVIRTQ                 pVirtq;                     /**< pointer to queue                               */
+    uint16_t                        idx;                        /**< Index of this worker                           */
     uint16_t                        pad;
 } VIRTIONETWORKERR3;
@@ -629 +629 @@
     if (IS_RX_VIRTQ(uVirtqNbr))
     {
-        uint16_t cBufsAvailable = virtioCoreVirtqAvailCount(pDevIns, pVirtio, uVirtqNbr);
+        uint16_t cBufsAvailable = virtioCoreVirtqAvailBufCount(pDevIns, pVirtio, uVirtqNbr);
 
         if (cBufsAvailable)
         {
             Log10Func(("%s %u empty bufs added to %s by guest (notifying leaf device)\n",
-                        pThis->szInst, cBufsAvailable, pVirtq->szName));
+                       pThis->szInst, cBufsAvailable, pVirtq->szName));
             virtioNetWakeupRxBufWaiter(pDevIns);
         }
@@ -884 +884 @@
     {
 
-        pHlp->pfnPrintf(pHlp, "Internal pointers:\n\n");
-
-        pHlp->pfnPrintf(pHlp, "    pDevIns ................... %p\n",  pDevIns);
-        pHlp->pfnPrintf(pHlp, "    PVIRTIONET ................ %p\n",  pThis);
-        pHlp->pfnPrintf(pHlp, "    PVIRTIONETCC .............. %p\n", pThisCC);
-        pHlp->pfnPrintf(pHlp, "    pDrvBase .................. %p\n",  pThisCC->pDrvBase);
-        pHlp->pfnPrintf(pHlp, "    pDrv ...................... %p\n",  pThisCC->pDrv);
-        pHlp->pfnPrintf(pHlp, "    pDrv ...................... %p\n",  pThisCC->pDrv);
+        pHlp->pfnPrintf(pHlp, "Internal Pointers:\n\n");
+
+        pHlp->pfnPrintf(pHlp, "    pDevIns ................... %p\n",   pDevIns);
+        pHlp->pfnPrintf(pHlp, "    PVIRTIONET ................ %p\n",   pThis);
+        pHlp->pfnPrintf(pHlp, "    PVIRTIONETCC .............. %p\n",   pThisCC);
+        pHlp->pfnPrintf(pHlp, "    pDrvBase .................. %p\n",   pThisCC->pDrvBase);
+        pHlp->pfnPrintf(pHlp, "    pDrv ...................... %p\n",   pThisCC->pDrv);
+        pHlp->pfnPrintf(pHlp, "    pDrv ...................... %p\n",   pThisCC->pDrv);
         pHlp->pfnPrintf(pHlp, "\n");
-        pHlp->pfnPrintf(pHlp, "Misc state\n");
-        pHlp->pfnPrintf(pHlp, "\n");
-        pHlp->pfnPrintf(pHlp, "    fVirtioReady .............. %d\n",  pThis->fVirtioReady);
-        pHlp->pfnPrintf(pHlp, "    fGenUpdatePending ......... %d\n",  pThis->Virtio.fGenUpdatePending);
-        pHlp->pfnPrintf(pHlp, "    fMsiSupport ............... %d\n",  pThis->Virtio.fMsiSupport);
-        pHlp->pfnPrintf(pHlp, "    uConfigGeneration ......... %d\n",  pThis->Virtio.uConfigGeneration);
-        pHlp->pfnPrintf(pHlp, "    uDeviceStatus ............. 0x%x\n", pThis->Virtio.uDeviceStatus);
-        pHlp->pfnPrintf(pHlp, "    cVirtqPairs .,............. %d\n",  pThis->cVirtqPairs);
-        pHlp->pfnPrintf(pHlp, "    cVirtVirtqs .,............. %d\n",  pThis->cVirtVirtqs);
-        pHlp->pfnPrintf(pHlp, "    cWorkers .................. %d\n",  pThis->cWorkers);
-        pHlp->pfnPrintf(pHlp, "    MMIO mapping name ......... %d\n",  pThisCC->Virtio.pcszMmioName);
 
     }
@@ -920 +909 @@
                 pThis->fQuiescing ? ")" : "");
         pHlp->pfnPrintf(pHlp, "    Resetting: ................ %s\n", pThis->fResetting ? "true" : "false");
+        pHlp->pfnPrintf(pHlp, "\n");
+        pHlp->pfnPrintf(pHlp, "Misc state\n");
+        pHlp->pfnPrintf(pHlp, "\n");
+        pHlp->pfnPrintf(pHlp, "    fVirtioReady .............. %d\n",   pThis->fVirtioReady);
+        pHlp->pfnPrintf(pHlp, "    fGenUpdatePending ......... %d\n",   pThis->Virtio.fGenUpdatePending);
+        pHlp->pfnPrintf(pHlp, "    fMsiSupport ............... %d\n",   pThis->Virtio.fMsiSupport);
+        pHlp->pfnPrintf(pHlp, "    uConfigGeneration ......... %d\n",   pThis->Virtio.uConfigGeneration);
+        pHlp->pfnPrintf(pHlp, "    uDeviceStatus ............. 0x%x\n", pThis->Virtio.uDeviceStatus);
+        pHlp->pfnPrintf(pHlp, "    cVirtqPairs .,............. %d\n",   pThis->cVirtqPairs);
+        pHlp->pfnPrintf(pHlp, "    cVirtVirtqs .,............. %d\n",   pThis->cVirtVirtqs);
+        pHlp->pfnPrintf(pHlp, "    cWorkers .................. %d\n",   pThis->cWorkers);
+        pHlp->pfnPrintf(pHlp, "    MMIO mapping name ......... %d\n",   pThisCC->Virtio.pcszMmioName);
         pHlp->pfnPrintf(pHlp, "\n");
     }
@@ -1497 +1498 @@
 static bool virtioNetR3RxBufsAvail(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIONETVIRTQ *pRxVirtq)
 {
-    for (int uVirtqNbrPair = 0; uVirtqNbrPair < pThis->cVirtqPairs; uVirtqNbrPair++)
-    {
-        PVIRTIONETVIRTQ pThisRxVirtq = &pThis->aVirtqs[RXQIDX(uVirtqNbrPair)];
+    for (int uVirtqPair = 0; uVirtqPair < pThis->cVirtqPairs; uVirtqPair++)
+    {
+        PVIRTIONETVIRTQ pThisRxVirtq = &pThis->aVirtqs[RXQIDX(uVirtqPair)];
         if (RT_SUCCESS(virtioNetR3CheckRxBufsAvail(pDevIns, pThis, pThisRxVirtq)))
         {
@@ -1551 +1552 @@
             RTThreadSleep(1);
         }
-LogFunc(("\n\n\n********** WAKEN!!!!! ********\n\n\n"));
     } while (virtioNetIsOperational(pThis, pDevIns));
 
@@ -1743 +1743 @@
         PVIRTQBUF pVirtqBuf = NULL;
 
-        int rc = virtioCoreR3VirtqBufGet(pDevIns, &pThis->Virtio, pRxVirtq->idx, &pVirtqBuf, true);
+        int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, pRxVirtq->idx, &pVirtqBuf, true);
         AssertMsgReturn(rc == VINF_SUCCESS || rc == VERR_NOT_AVAILABLE, ("%Rrc\n", rc), rc);
 
@@ -1752 +1752 @@
                             VERR_INTERNAL_ERROR);
 
-        /* Length of first seg of guest Rx buf should never be less than sizeof(virtio_net_pkt_hdr).
+        /* Length of first seg of guest Rx S/G buf should never be less than sizeof(virtio_net_pkt_hdr).
          * Otherwise code has to become more complicated, e.g. locate & cache seg idx & offset of
-         * virtio_net_header.num_buffers, to defer updating (in GCPhys). Re-visit if needed */
+         * virtio_net_header.num_buffers, to facilitate deferring updating GCPhys memory. Re-visit if needed */
 
         AssertMsgReturnStmt(pVirtqBuf->pSgPhysReturn->paSegs[0].cbSeg >= sizeof(VIRTIONETPKTHDR),
@@ -1777 +1777 @@
                 memcpy(paVirtSegsToGuest[0].pvSeg, rxPktHdr, cbHdr);
 
-                /* Calculate & cache addr of field to update after final value is known, in GCPhys mem */
+                /* Calculate & cache GCPhys addr of field to update after final value is known */
                 GCPhysPktHdrNumBuffers = pVirtqBuf->pSgPhysReturn->paSegs[0].GCPhys
                                          + RT_UOFFSETOF(VIRTIONETPKTHDR, uNumBuffers);
@@ -1804 +1804 @@
             Log7Func(("Send Rx pkt to guest...\n"));
             STAM_PROFILE_START(&pThis->StatReceiveStore, a);
-            virtioCoreR3VirtqBufPut(pDevIns, &pThis->Virtio, pRxVirtq->idx,
-                                 pVirtSegBufToGuest, pVirtqBuf, true /* fFence */);
+            virtioCoreR3VirtqUsedBufPut(pDevIns, &pThis->Virtio, pRxVirtq->idx,
+                                    pVirtSegBufToGuest, pVirtqBuf, true /* fFence */);
             STAM_PROFILE_STOP(&pThis->StatReceiveStore, a);
 
@@ -1828 +1828 @@
                   rc);
 
-    virtioCoreVirtqSync(pDevIns, &pThis->Virtio, pRxVirtq->idx);
+    virtioCoreVirtqSyncUsedRing(pDevIns, &pThis->Virtio, pRxVirtq->idx);
 
     return VINF_SUCCESS;
@@ -1850 +1850 @@
  */
 static int virtioNetR3HandleRxPacket(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIONETCC pThisCC,
-                                const void *pvBuf, size_t cb, PCPDMNETWORKGSO pGso, PVIRTIONETVIRTQ pRxVirtq)
+                                     const void *pvBuf, size_t cb, PCPDMNETWORKGSO pGso, PVIRTIONETVIRTQ pRxVirtq)
 {
     RT_NOREF(pThisCC);
@@ -1919 +1919 @@
     PPDMDEVINS      pDevIns = pThisCC->pDevIns;
     PVIRTIONET      pThis   = PDMDEVINS_2_DATA(pDevIns, PVIRTIONET);
-LogFunc(("\n"));
     if (!pThis->fVirtioReady)
     {
@@ -1963 +1962 @@
               selection algorithm feasible or even necessary to prevent starvation? */
 
-    for (int uVirtqNbrPair = 0; uVirtqNbrPair < pThis->cVirtqPairs; uVirtqNbrPair++)
-    {
-
-        PVIRTIONETVIRTQ pRxVirtq = &pThis->aVirtqs[RXQIDX(uVirtqNbrPair)];
+    for (int uVirtqPair = 0; uVirtqPair < pThis->cVirtqPairs; uVirtqPair++)
+    {
+
+        PVIRTIONETVIRTQ pRxVirtq = &pThis->aVirtqs[RXQIDX(uVirtqPair)];
         if (RT_SUCCESS(!virtioNetR3CheckRxBufsAvail(pDevIns, pThis, pRxVirtq)))
         {
@@ -2000 +1999 @@
 
 /* Read physical bytes from the out segment(s) of descriptor chain */
-static void virtioNetR3PullChain(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTQBUF pVirtqBuf, void *pv, size_t cb)
+static void virtqNetR3PullBytesFromVirtqBuf(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTQBUF pVirtqBuf,
+                                              void *pv, size_t cb)
 {
     uint8_t *pb = (uint8_t *)pv;
@@ -2007 +2007 @@
     {
         size_t cbSeg = cbLim;
-        RTGCPHYS GCPhys = virtioCoreSgBufGetNextSegment(pVirtqBuf->pSgPhysSend, &cbSeg);
+        RTGCPHYS GCPhys = virtioCoreGCPhysChainGetNextSegment(pVirtqBuf->pSgPhysSend, &cbSeg);
         PDMDevHlpPCIPhysRead(pDevIns, GCPhys, pb, cbSeg);
         pb += cbSeg;
@@ -2046 +2046 @@
 
     uint8_t fOn, fPromiscChanged = false;
-    virtioNetR3PullChain(pDevIns, pThis, pVirtqBuf, &fOn, (size_t)RT_MIN(pVirtqBuf->cbPhysSend, sizeof(fOn)));
+    virtqNetR3PullBytesFromVirtqBuf(pDevIns, pThis, pVirtqBuf, &fOn, (size_t)RT_MIN(pVirtqBuf->cbPhysSend, sizeof(fOn)));
 
     switch(pCtrlPktHdr->uCmd)
@@ -2117 +2117 @@
             /* Set default Rx filter MAC */
             ASSERT_CTRL_ADDR_SET(cbRemaining >= sizeof(VIRTIONET_CTRL_MAC_TABLE_LEN));
-            virtioNetR3PullChain(pDevIns, pThis, pVirtqBuf, &pThis->rxFilterMacDefault, sizeof(VIRTIONET_CTRL_MAC_TABLE_LEN));
+            virtqNetR3PullBytesFromVirtqBuf(pDevIns, pThis, pVirtqBuf, &pThis->rxFilterMacDefault, sizeof(VIRTIONET_CTRL_MAC_TABLE_LEN));
             break;
         }
@@ -2126 +2126 @@
             /* Load unicast MAC filter table */
             ASSERT_CTRL_TABLE_SET(cbRemaining >= sizeof(cMacs));
-            virtioNetR3PullChain(pDevIns, pThis, pVirtqBuf, &cMacs, sizeof(cMacs));
+            virtqNetR3PullBytesFromVirtqBuf(pDevIns, pThis, pVirtqBuf, &cMacs, sizeof(cMacs));
             cbRemaining -= sizeof(cMacs);
             Log7Func(("%s Guest provided %d unicast MAC Table entries\n", pThis->szInst, cMacs));
@@ -2133 +2133 @@
                 uint32_t cbMacs = cMacs * sizeof(RTMAC);
                 ASSERT_CTRL_TABLE_SET(cbRemaining >= cbMacs);
-                virtioNetR3PullChain(pDevIns, pThis, pVirtqBuf, &pThis->aMacUnicastFilter, cbMacs);
+                virtqNetR3PullBytesFromVirtqBuf(pDevIns, pThis, pVirtqBuf, &pThis->aMacUnicastFilter, cbMacs);
                 cbRemaining -= cbMacs;
             }
@@ -2140 +2140 @@
             /* Load multicast MAC filter table */
             ASSERT_CTRL_TABLE_SET(cbRemaining >= sizeof(cMacs));
-            virtioNetR3PullChain(pDevIns, pThis, pVirtqBuf, &cMacs, sizeof(cMacs));
+            virtqNetR3PullBytesFromVirtqBuf(pDevIns, pThis, pVirtqBuf, &cMacs, sizeof(cMacs));
             cbRemaining -= sizeof(cMacs);
             Log10Func(("%s Guest provided %d multicast MAC Table entries\n", pThis->szInst, cMacs));
@@ -2147 +2147 @@
                 uint32_t cbMacs = cMacs * sizeof(RTMAC);
                 ASSERT_CTRL_TABLE_SET(cbRemaining >= cbMacs);
-                virtioNetR3PullChain(pDevIns, pThis, pVirtqBuf, &pThis->aMacMulticastFilter, cbMacs);
+                virtqNetR3PullBytesFromVirtqBuf(pDevIns, pThis, pVirtqBuf, &pThis->aMacMulticastFilter, cbMacs);
                 cbRemaining -= cbMacs;
             }
@@ -2177 +2177 @@
     AssertMsgReturn(cbRemaining > sizeof(uVlanId),
         ("DESC chain too small for VIRTIO_NET_CTRL_VLAN cmd processing"), VIRTIONET_ERROR);
-    virtioNetR3PullChain(pDevIns, pThis, pVirtqBuf, &uVlanId, sizeof(uVlanId));
+    virtqNetR3PullBytesFromVirtqBuf(pDevIns, pThis, pVirtqBuf, &uVlanId, sizeof(uVlanId));
     AssertMsgReturn(uVlanId > VIRTIONET_MAX_VLAN_ID,
         ("%s VLAN ID out of range (VLAN ID=%u)\n", pThis->szInst, uVlanId), VIRTIONET_ERROR);
@@ -2221 +2221 @@
                         ("DESC chain too small for CTRL pkt header"));
 
-    virtioNetR3PullChain(pDevIns, pThis, pVirtqBuf, pCtrlPktHdr,
+    virtqNetR3PullBytesFromVirtqBuf(pDevIns, pThis, pVirtqBuf, pCtrlPktHdr,
                          RT_MIN(pVirtqBuf->cbPhysSend, sizeof(VIRTIONET_CTRL_HDR_T)));
 
@@ -2285 +2285 @@
     RTSgBufInit(pReturnSegBuf, paReturnSegs, cSegs);
 
-    virtioCoreR3VirtqBufPut(pDevIns, &pThis->Virtio, CTRLQIDX, pReturnSegBuf, pVirtqBuf, true /* fFence */);
-    virtioCoreVirtqSync(pDevIns, &pThis->Virtio, CTRLQIDX);
+    virtioCoreR3VirtqUsedBufPut(pDevIns, &pThis->Virtio, CTRLQIDX, pReturnSegBuf, pVirtqBuf, true /* fFence */);
+    virtioCoreVirtqSyncUsedRing(pDevIns, &pThis->Virtio, CTRLQIDX);
 
     for (int i = 0; i < cSegs; i++)
@@ -2435 +2435 @@
     }
 
-    int cPkts = virtioCoreVirtqAvailCount(pVirtio->pDevInsR3, pVirtio, pTxVirtq->idx);
+    int cPkts = virtioCoreVirtqAvailBufCount(pVirtio->pDevInsR3, pVirtio, pTxVirtq->idx);
     if (!cPkts)
     {
@@ -2452 +2452 @@
     int rc;
     PVIRTQBUF pVirtqBuf = NULL;
-    while ((rc = virtioCoreR3VirtqBufPeek(pVirtio->pDevInsR3, pVirtio, pTxVirtq->idx, &pVirtqBuf)) == VINF_SUCCESS)
+    while ((rc = virtioCoreR3VirtqAvailBufPeek(pVirtio->pDevInsR3, pVirtio, pTxVirtq->idx, &pVirtqBuf)) == VINF_SUCCESS)
     {
         Log10Func(("%s fetched descriptor chain from %s\n", pThis->szInst, pTxVirtq->szName));
@@ -2484 +2484 @@
             if (RT_FAILURE(rc))
                 return;
-            virtioCoreSgBufAdvance(pSgPhysSend, sizeof(PktHdr));
+            virtioCoreGCPhysChainAdvance(pSgPhysSend, sizeof(PktHdr));
 
             PDMNETWORKGSO  Gso, *pGso = virtioNetR3SetupGsoCtx(&Gso, &PktHdr);
@@ -2509 +2509 @@
                                          (RTGCPHYS)pSgPhysSend->GCPhysCur,
                                          ((uint8_t *)pSgBufToPdmLeafDevice->aSegs[0].pvSeg) + uOffset, cbCopied);
-                    virtioCoreSgBufAdvance(pSgPhysSend, cbCopied);
+                    virtioCoreGCPhysChainAdvance(pSgPhysSend, cbCopied);
                     cbRemain -= cbCopied;
                     uOffset += cbCopied;
@@ -2537 +2537 @@
             }
 
-            /* Remove this descriptor chain from the available ring */
-            virtioCoreR3VirtqBufSkip(pVirtio, pTxVirtq->idx);
-
-            /* No data to return to guest, but call is needed put elem (e.g. desc chain) on used ring */
-            virtioCoreR3VirtqBufPut(pVirtio->pDevInsR3, pVirtio, pTxVirtq->idx, NULL, pVirtqBuf, true /* fFence */);
+            /* Point to next descriptor in avail ring of virtq */
+            virtioCoreR3VirtqAvailBufNext(pVirtio, pTxVirtq->idx);
+
+            /* No data to return to guest, but necessary to put elem (e.g. desc chain head idx) on used ring */
+            virtioCoreR3VirtqUsedBufPut(pVirtio->pDevInsR3, pVirtio, pTxVirtq->idx, NULL, pVirtqBuf, true /* fFence */);
 
             /* Update used ring idx and notify guest that we've transmitted the data it sent */
-            virtioCoreVirtqSync(pVirtio->pDevInsR3, pVirtio, pTxVirtq->idx);
+            virtioCoreVirtqSyncUsedRing(pVirtio->pDevInsR3, pVirtio, pTxVirtq->idx);
         }
 
@@ -2772 +2772 @@
     pVirtq->pWorker    = pWorker;
     pVirtq->pWorkerR3  = pWorkerR3;
-    pWorker->fAssigned = true;
+    pWorker->fAssigned = true;  /* Because worker's state held in fixed-size array w/empty slots */
 
     LogFunc(("%s pThread: %p\n", pVirtq->szName, pWorkerR3->pThread));
@@ -2794 +2794 @@
 
     uint16_t idxWorker = CTRLWIDX + 1;
-    for (uint16_t uVirtqNbrPair = 0; uVirtqNbrPair < pThis->cVirtqPairs; uVirtqNbrPair++, idxWorker++)
-    {
-        PVIRTIONETVIRTQ pTxVirtq = &pThis->aVirtqs[TXQIDX(uVirtqNbrPair)];
-        PVIRTIONETVIRTQ pRxVirtq = &pThis->aVirtqs[RXQIDX(uVirtqNbrPair)];
+    for (uint16_t uVirtqPair = 0; uVirtqPair < pThis->cVirtqPairs; uVirtqPair++, idxWorker++)
+    {
+        PVIRTIONETVIRTQ pTxVirtq = &pThis->aVirtqs[TXQIDX(uVirtqPair)];
+        PVIRTIONETVIRTQ pRxVirtq = &pThis->aVirtqs[RXQIDX(uVirtqPair)];
 
         rc = virtioNetR3CreateOneWorkerThread(pDevIns, pThis, idxWorker, &pThis->aWorkers[idxWorker],
@@ -2806 +2806 @@
         pRxVirtq->fHasWorker = false;
     }
-    pThis->cWorkers = pThis->cVirtqPairs + 1 /* Control virtq */;
+    pThis->cWorkers = pThis->cVirtqPairs + 1 /* One control virtq */;
     return rc;
 }
@@ -2860 +2860 @@
                  Log10Func(("%s %s worker woken. Fetching desc chain\n", pThis->szInst, pVirtq->szName));
                  PVIRTQBUF pVirtqBuf = NULL;
-                 int rc = virtioCoreR3VirtqBufGet(pDevIns, &pThis->Virtio, pVirtq->idx, &pVirtqBuf, true);
+                 int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, pVirtq->idx, &pVirtqBuf, true);
                  if (rc == VERR_NOT_AVAILABLE)
                  {
@@ -3086 +3086 @@
     RTStrPrintf(pThis->szInst, sizeof(pThis->szInst), "VNET%d", iInstance);
 
-// Temporary for less logging clutter for singled-instance debugging
-*pThis->szInst = '\0';
+    /** todo Remove next line (temporary hack used for less logging clutter for single-instance debugging) */
+    *pThis->szInst = '\0';
 
     pThisCC->pDevIns     = pDevIns;
@@ -3144 +3144 @@
 
     /*
-     * Do core virtio initialization.
+     * Configure Virtio core (generic Virtio queue and infrastructure management) parameters.
      */
-
 #   if FEATURE_OFFERED(STATUS)
         pThis->virtioNetConfig.uStatus = 0;
@@ -3155 +3154 @@
 #   endif
 
-    /* Initialize the generic Virtio core: */
     pThisCC->Virtio.pfnVirtqNotified        = virtioNetVirtqNotified;
     pThisCC->Virtio.pfnStatusChanged        = virtioNetR3StatusChanged;
@@ -3166 +3164 @@
     VirtioPciParams.uClassSub               = PCI_CLASS_SUB_NET_ETHERNET_CONTROLLER;
     VirtioPciParams.uClassProg              = PCI_CLASS_PROG_UNSPECIFIED;
-    VirtioPciParams.uSubsystemId            = PCI_DEVICE_ID_VIRTIONET_HOST;  /* VirtIO 1.0 spec allows PCI Device ID here */
+    VirtioPciParams.uSubsystemId            = PCI_DEVICE_ID_VIRTIONET_HOST;  /* VirtIO 1.0 allows PCI Device ID here */
     VirtioPciParams.uInterruptLine          = 0x00;
     VirtioPciParams.uInterruptPin           = 0x01;
 
-    /*
-     * Create the semaphore that will be used to synchronize/throttle
-     * the downstream LUN's Rx waiter thread.
-     */
+    /* Create semaphore used to synchronize/throttle the downstream LUN's Rx waiter thread. */
     rc = PDMDevHlpSUPSemEventCreate(pDevIns, &pThis->hEventRxDescAvail);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to create event semaphore"));
 
-    /*
-     * Initialize VirtIO core. This will result in a "status changed" callback
-     * when VirtIO is ready, at which time the Rx queue and ctrl queue worker threads will be created.
-     */
+    /* Initialize VirtIO core. (pfnStatusChanged callback when VirtIO and guest are ready) */
     rc = virtioCoreR3Init(pDevIns, &pThis->Virtio, &pThisCC->Virtio, &VirtioPciParams, pThis->szInst,
                           VIRTIONET_HOST_FEATURES_OFFERED,