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

Timestamp:

Feb 3, 2020 4:59:10 PM (5 years ago)

Author:

vboxsync

Message:

Network/DevVirtioNet_1_0.cpp: Device appears and is doing transactions over VirtIO but snags when client setups MAC filter. See BugRef(#8651) Comment #53

File:

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

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

@@ -40 +40 @@
 *********************************************************************************************************************************/
 #define INSTANCE(a_pVirtio)                 ((a_pVirtio)->szInstance)
-#define QUEUE_NAME(a_pVirtio, a_idxQueue)   ((a_pVirtio)->virtqState[(a_idxQueue)].szVirtqName)
+#define VIRTQNAME(a_pVirtio, a_idxQueue)    ((a_pVirtio)->virtqState[(a_idxQueue)].szVirtqName)
 #define IS_DRIVER_OK(a_pVirtio)             ((a_pVirtio)->uDeviceStatus & VIRTIO_STATUS_DRIVER_OK)
 
@@ -174 +174 @@
 DECLINLINE(bool) virtqIsEmpty(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, uint16_t idxQueue)
 {
-    uint16_t uAvailGst = virtioReadAvailRingIdx(pDevIns, pVirtio, idxQueue);
-    bool fEmpty = uAvailGst == pVirtio->virtqState[idxQueue].uAvailIdx;
-
-    Log6Func(("Q<%u>: uAvailGst=%u uAvailIdx=%u -> fEmpty=%RTbool\n",
-             idxQueue, uAvailGst, pVirtio->virtqState[idxQueue].uAvailIdx, fEmpty));
+    uint16_t uAvailGuest = virtioReadAvailRingIdx(pDevIns, pVirtio, idxQueue);
+    bool fEmpty = uAvailGuest == pVirtio->virtqState[idxQueue].uAvailIdx;
+
+    Log6Func(("%s: uAvailGuest=%u uAvailIdx=%u. (%s)\n",
+             VIRTQNAME(pVirtio, idxQueue), uAvailGuest, pVirtio->virtqState[idxQueue].uAvailIdx,
+             fEmpty ? "Queue empty" : "Queue has available descriptors"));
     return fEmpty;
 }
@@ -618 +619 @@
         if (desc.fFlags & VIRTQ_DESC_F_WRITE)
         {
-            Log3Func(("%s IN  desc_idx=%u seg=%u addr=%RGp cb=%u\n", QUEUE_NAME(pVirtio, idxQueue), uDescIdx, cSegsIn, desc.GCPhysBuf, desc.cb));
+            Log3Func(("%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", QUEUE_NAME(pVirtio, idxQueue), uDescIdx, cSegsOut, desc.GCPhysBuf, desc.cb));
+            Log3Func(("%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++]);
@@ -668 +669 @@
 {
     virtioKick(pVirtio->pDevIns, pVirtio, VIRTIO_ISR_DEVICE_CONFIG, pVirtio->uMsixConfig, false);
-
 }
 
@@ -680 +680 @@
 void virtioCoreQueueSetNotify(PVIRTIOCORE pVirtio, uint16_t idxQueue, bool fEnabled)
 {
-    uint16_t fFlags = virtioReadUsedFlags(pVirtio->pDevIns, pVirtio, idxQueue);
-
-    if (fEnabled)
-        fFlags &= ~ VIRTQ_USED_F_NO_NOTIFY;
-    else
-        fFlags |= VIRTQ_USED_F_NO_NOTIFY;
-
-    virtioWriteUsedFlags(pVirtio->pDevIns, pVirtio, idxQueue, fFlags);
+    if (pVirtio->uDeviceStatus & VIRTIO_STATUS_DRIVER_OK)
+    {
+        uint16_t fFlags = virtioReadUsedFlags(pVirtio->pDevIns, pVirtio, idxQueue);
+
+        if (fEnabled)
+            fFlags &= ~ VIRTQ_USED_F_NO_NOTIFY;
+        else
+            fFlags |= VIRTQ_USED_F_NO_NOTIFY;
+
+        virtioWriteUsedFlags(pVirtio->pDevIns, pVirtio, idxQueue, fFlags);
+    }
 }
 
@@ -858 +861 @@
 
     Log3Func(("Copying client data to %s, desc chain (head desc_idx %d)\n",
-              QUEUE_NAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue)));
+              VIRTQNAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue)));
 
     /*
@@ -906 +909 @@
 
     Log6Func(("Write ahead used_idx=%u, %s used_idx=%u\n",
-              pVirtq->uUsedIdx, QUEUE_NAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue)));
+              pVirtq->uUsedIdx, VIRTQNAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue)));
 
     RTMemFree((void *)pDescChain->pSgPhysSend->paSegs);
@@ -946 +949 @@
 
     Log6Func(("Updating %s used_idx from %u to %u\n",
-              QUEUE_NAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue), pVirtq->uUsedIdx));
+              VIRTQNAME(pVirtio, idxQueue), virtioReadUsedRingIdx(pDevIns, pVirtio, idxQueue), pVirtq->uUsedIdx));
 
     virtioWriteUsedRingIdx(pDevIns, pVirtio, idxQueue, pVirtq->uUsedIdx);
@@ -1162 +1165 @@
 #ifdef LOG_ENABLED
 # define LOG_COMMON_CFG_ACCESS(member, a_offIntra) \
-    virtioCoreLogMappedIoValue(__FUNCTION__, #member, RT_SIZEOFMEMB(VIRTIO_PCI_COMMON_CFG_T, member), \
-                           pv, cb, a_offIntra, fWrite, false, 0);
+    if (LogIs7Enabled()) { \
+        virtioCoreLogMappedIoValue(__FUNCTION__, #member, RT_SIZEOFMEMB(VIRTIO_PCI_COMMON_CFG_T, member), \
+                                   pv, cb, a_offIntra, fWrite, false, 0); \
+    }
 # define LOG_COMMON_CFG_ACCESS_INDEXED(member, idx, a_offIntra) \
-    virtioCoreLogMappedIoValue(__FUNCTION__, #member, RT_SIZEOFMEMB(VIRTIO_PCI_COMMON_CFG_T, member), \
-                           pv, cb, a_offIntra, fWrite, true, idx);
+    if (LogIs7Enabled()) { \
+        virtioCoreLogMappedIoValue(__FUNCTION__, #member, RT_SIZEOFMEMB(VIRTIO_PCI_COMMON_CFG_T, member), \
+                                   pv, cb, a_offIntra, fWrite, true, idx); \
+    }
 #else
 # define LOG_COMMON_CFG_ACCESS(member, a_offIntra)              do { } while (0)
@@ -1310 +1317 @@
         {
             uint8_t const fNewStatus = *(uint8_t *)pv;
-            Log6Func(("Guest wrote uDeviceStatus (%#x, was %#x, change #%x) ................ (",
+            Log7Func(("Guest wrote uDeviceStatus (%#x, was %#x, change #%x) ................ (",
                       fNewStatus, pVirtio->uDeviceStatus, fNewStatus ^ pVirtio->uDeviceStatus));
-            virtioLogDeviceStatus(fNewStatus);
-            Log6((")\n"));
+            if (LogIs7Enabled())
+                virtioLogDeviceStatus(fNewStatus);
+            Log7((")\n"));
 
             /* If the status changed or we were reset, we need to go to ring-3 as
@@ -1344 +1352 @@
         else /* Guest READ pCommonCfg->uDeviceStatus */
         {
-            Log6Func(("Guest read  uDeviceStatus ................ ("));
+            Log7Func(("Guest read  uDeviceStatus ................ ("));
             *(uint8_t *)pv = pVirtio->uDeviceStatus;
-            virtioLogDeviceStatus(pVirtio->uDeviceStatus);
-            Log6((")\n"));
+            if (LogIs7Enabled())
+                virtioLogDeviceStatus(pVirtio->uDeviceStatus);
+            Log7((")\n"));
         }
     }
@@ -1451 +1460 @@
         }
 
-        if (pVirtio->fMsiSupport)
-            PDMDevHlpPCISetIrq(pDevIns, pVirtio->uMsixConfig, PDM_IRQ_LEVEL_LOW);
-
+        virtioLowerInterrupt(pDevIns, 0);
         return rcStrict;
 #else
@@ -1546 +1553 @@
     RT_NOREF(pPciDev);
 
-    LogFlowFunc(("pDevIns=%p pPciDev=%p uAddress=%#x cb=%u pu32Value=%p\n",
+    Log7Func(("pDevIns=%p pPciDev=%p uAddress=%#x cb=%u pu32Value=%p\n",
                  pDevIns, pPciDev, uAddress, cb, pu32Value));
     if (uAddress == pVirtio->uPciCfgDataOff)
@@ -1586 +1593 @@
     RT_NOREF(pPciDev);
 
-    LogFlowFunc(("pDevIns=%p pPciDev=%p uAddress=%#x cb=%u u32Value=%#x\n", pDevIns, pPciDev, uAddress, cb, u32Value));
+    Log7Func(("pDevIns=%p pPciDev=%p uAddress=%#x cb=%u u32Value=%#x\n", pDevIns, pPciDev, uAddress, cb, u32Value));
     if (uAddress == pVirtio->uPciCfgDataOff)
     {