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

Timestamp:

Aug 18, 2020 12:58:30 PM (4 years ago)

Author:

vboxsync

Message:

Fix assert when guest uses raw PCI bus access to get 1, 2, 4 byte quantities in early boot

File:

• trunk/src/VBox/Devices/VirtIO/VirtioCore.cpp (modified) (6 diffs)

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

@@ -287 +287 @@
 DECLINLINE(uint16_t) virtioCoreVirtqAvailBufCount_inline(PPDMDEVINS pDevIns, PVIRTIOCORE pVirtio, PVIRTQUEUE pVirtq)
 {
-    uint16_t uIdx    = virtioReadAvailRingIdx(pDevIns, pVirtio, pVirtq);
-    uint16_t uShadow = pVirtq->uAvailIdxShadow;
-
-    uint16_t uDelta;
-    if (uIdx < uShadow)
-        uDelta = (uIdx + VIRTQ_MAX_ENTRIES) - uShadow;
-    else
-        uDelta = uIdx - uShadow;
+    uint16_t uIdxActual = virtioReadAvailRingIdx(pDevIns, pVirtio, pVirtq);
+    uint16_t uIdxShadow = pVirtq->uAvailIdxShadow;
+    uint16_t uIdxDelta;
+
+    if (uIdxActual < uIdxShadow)
+        uIdxDelta = (uIdxActual + VIRTQ_MAX_ENTRIES) - uIdxShadow;
+    else
+        uIdxDelta = uIdxActual - uIdxShadow;
 
     LogFunc(("%s has %u %s (idx=%u shadow=%u)\n",
-        pVirtq->szName, uDelta, uDelta == 1 ? "entry" : "entries",
-        uIdx, uShadow));
-
-    return uDelta;
+        pVirtq->szName, uIdxDelta, uIdxDelta == 1 ? "entry" : "entries",
+        uIdxActual, uIdxShadow));
+
+    return uIdxDelta;
 }
 /**
@@ -763 +763 @@
     pVirtqBuf->uHeadIdx  = uHeadIdx;
     pVirtqBuf->uVirtq    = uVirtq;
-    *ppVirtqBuf = pVirtqBuf;
+    *ppVirtqBuf          = pVirtqBuf;
 
     /*
@@ -1486 +1486 @@
     RT_NOREF(pPciDev);
 
-    Log7Func((" pDevIns=%p pPciDev=%p uAddress=%#x%s cb=%u pu32Value=%p\n",
-                 pDevIns, pPciDev, uAddress,  uAddress < 0x10 ? " " : "", cb, pu32Value));
     if (uAddress == pVirtio->uPciCfgDataOff)
     {
@@ -1498 +1496 @@
         uint32_t uLength = pPciCap->uLength;
 
+        Log7Func((" pDevIns=%p pPciDev=%p uAddress=%#x%s cb=%u uLength=%d, bar=%d\n",
+                     pDevIns, pPciDev, uAddress,  uAddress < 0x10 ? " " : "", cb, uLength, pPciCap->uBar));
+
         if (  (uLength != 1 && uLength != 2 && uLength != 4)
             || cb != uLength
             || pPciCap->uBar != VIRTIO_REGION_PCI_CAP)
         {
-            ASSERT_GUEST_MSG_FAILED(("Guest read virtio_pci_cfg_cap.pci_cfg_data using mismatching config. Ignoring\n"));
+            ASSERT_GUEST_MSG_FAILED(("Guest read virtio_pci_cfg_cap.pci_cfg_data using mismatching config. "
+                                     "Ignoring\n"));
             *pu32Value = UINT32_MAX;
             return VINF_SUCCESS;
@@ -1508 +1510 @@
 
         VBOXSTRICTRC rcStrict = virtioMmioRead(pDevIns, pVirtio, pPciCap->uOffset, pu32Value, cb);
-        Log7Func(("virtio: Guest read  virtio_pci_cfg_cap.pci_cfg_data, bar=%d, offset=%d, length=%d, result=%d -> %Rrc\n",
+        Log7Func((" Guest read virtio_pci_cfg_cap.pci_cfg_data, bar=%d, offset=%d, length=%d, result=0x%x -> %Rrc\n",
                    pPciCap->uBar, pPciCap->uOffset, uLength, *pu32Value, VBOXSTRICTRC_VAL(rcStrict)));
         return rcStrict;
     }
+    Log7Func((" pDevIns=%p pPciDev=%p uAddress=%#x%s cb=%u pu32Value=%p\n",
+                 pDevIns, pPciDev, uAddress,  uAddress < 0x10 ? " " : "", cb, pu32Value));
     return VINF_PDM_PCI_DO_DEFAULT;
 }
@@ -1860 +1864 @@
     pCfg->uCapLen  = sizeof(VIRTIO_PCI_CFG_CAP_T);
     pCfg->uCapNext = (pVirtio->fMsiSupport || pVirtioCC->pbDevSpecificCfg) ? CFG_ADDR_2_IDX(pCfg) + pCfg->uCapLen : 0;
-    pCfg->uBar     = 0;
+    pCfg->uBar     = VIRTIO_REGION_PCI_CAP;
     pCfg->uOffset  = 0;
-    pCfg->uLength  = 0;
+    pCfg->uLength  = 4;
     cbRegion += pCfg->uLength;
     SET_PCI_CAP_LOC(pPciDev, pCfg, pVirtio->LocPciCfgCap, 1);