Changeset 81402 in vbox

Timestamp:

Oct 21, 2019 12:23:24 PM (5 years ago)

Author:

vboxsync

Message:

VirtIO: Fix access to the VirtIO registers through the PCI config space window

File:

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

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

@@ -884 +884 @@
 {
     PVIRTIOSTATE pVirtio = *PDMINS_2_DATA(pDevIns, PVIRTIOSTATE *);
-    RT_NOREF(pPciDev, cb);
-
-    uint64_t uWindowOff = (uint64_t)uAddress - (uint64_t)pVirtio->pPciCfgCap->uPciCfgData;
-    if (uWindowOff < sizeof(uint32_t))
+    RT_NOREF(pPciDev);
+
+    LogFlowFunc(("pDevIns=%p pPciDev=%p uAddress=%#x cb=%u pu32Value=%p\n",
+                 pDevIns, pPciDev, uAddress, cb, pu32Value));
+    if (uAddress == pVirtio->uPciCfgDataOff)
+    {
+        /*
+         * VirtIO 1.0 spec section 4.1.4.7 describes a required alternative access capability
+         * whereby the guest driver can specify a bar, offset, and length via the PCI configuration space
+         * (the virtio_pci_cfg_cap capability), and access data items.
+         */
+        uint32_t uLength = pVirtio->pPciCfgCap->pciCap.uLength;
+        uint32_t uOffset = pVirtio->pPciCfgCap->pciCap.uOffset;
+        uint8_t  uBar    = pVirtio->pPciCfgCap->pciCap.uBar;
+
+        if (   (uLength != 1 && uLength != 2 && uLength != 4)
+            || cb != uLength
+            || uBar != VIRTIO_REGION_PCI_CAP)
+        {
+            Log2Func(("Guest read virtio_pci_cfg_cap.pci_cfg_data using mismatching config. Ignoring\n"));
+            *pu32Value = UINT32_MAX;
+            return VINF_SUCCESS;
+        }
+
+        int rc = virtioR3MmioRead(pDevIns, NULL, pVirtio->pGcPhysPciCapBase + uOffset, pu32Value, cb);
+        Log2Func(("virtio: Guest read  virtio_pci_cfg_cap.pci_cfg_data, bar=%d, offset=%d, length=%d, result=%d -> %Rrc\n",
+                  uBar, uOffset, uLength, *pu32Value, rc));
+        return rc;
+    }
+    return VINF_PDM_PCI_DO_DEFAULT;
+}
+
+/**
+ * @callback_method_impl{FNPCICONFIGWRITE}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) virtioR3PciConfigWrite(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
+                                                         uint32_t uAddress, unsigned cb, uint32_t u32Value)
+{
+    PVIRTIOSTATE pVirtio = *PDMINS_2_DATA(pDevIns, PVIRTIOSTATE *);
+    RT_NOREF(pPciDev);
+
+    LogFlowFunc(("pDevIns=%p pPciDev=%p uAddress=%#x cb=%u u32Value=%#x\n",
+                 pDevIns, pPciDev, uAddress, cb, u32Value));
+    if (uAddress == pVirtio->uPciCfgDataOff)
     {
         /* VirtIO 1.0 spec section 4.1.4.7 describes a required alternative access capability
@@ -897 +937 @@
         uint8_t  uBar    = pVirtio->pPciCfgCap->pciCap.uBar;
 
-        AssertReturn(uLength == 1 || uLength == 2 || uLength == 4, VERR_INVALID_PARAMETER);
-        AssertReturn(cb + uWindowOff <= uLength, VERR_INVALID_PARAMETER);
-
-        *pu32Value = 0xffffffff;
-        if (uBar == VIRTIO_REGION_PCI_CAP)
-        {
-            uint32_t pu32tmp = 0;
-            virtioR3MmioRead(pDevIns, NULL, (RTGCPHYS)((uint32_t)pVirtio->pGcPhysPciCapBase + uOffset), &pu32tmp, uLength);
-            memcpy(pu32Value + uWindowOff, &pu32tmp + uWindowOff, cb);
-            Log2Func(("virtio: Guest read  virtio_pci_cfg_cap.pci_cfg_data, bar=%d, offset=%d, length=%d, result=%d\n",
-                      uBar, uOffset, uLength, *pu32Value));
-        }
-        else
-            Log2Func(("Guest read virtio_pci_cfg_cap.pci_cfg_data using unconfigured BAR. Ignoring"));
-        return VINF_SUCCESS;
-    }
-    return VINF_PDM_PCI_DO_DEFAULT;
-}
-
-/**
- * @callback_method_impl{FNPCICONFIGWRITE}
- */
-static DECLCALLBACK(VBOXSTRICTRC) virtioR3PciConfigWrite(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
-                                                         uint32_t uAddress, unsigned cb, uint32_t u32Value)
-{
-    PVIRTIOSTATE pVirtio = *PDMINS_2_DATA(pDevIns, PVIRTIOSTATE *);
-    RT_NOREF(pPciDev, cb);
-
-    uint64_t uWindowOff = (uint64_t)uAddress - (uint64_t)pVirtio->pPciCfgCap->uPciCfgData;
-    if (uWindowOff < sizeof(uint32_t))
-    {
-        /* VirtIO 1.0 spec section 4.1.4.7 describes a required alternative access capability
-         * whereby the guest driver can specify a bar, offset, and length via the PCI configuration space
-         * (the virtio_pci_cfg_cap capability), and access data items. */
-
-        uint32_t uLength = pVirtio->pPciCfgCap->pciCap.uLength;
-        uint32_t uOffset = pVirtio->pPciCfgCap->pciCap.uOffset;
-        uint8_t  uBar    = pVirtio->pPciCfgCap->pciCap.uBar;
-
-        AssertReturn(uLength == 1 || uLength == 2 || uLength == 4, VERR_INVALID_PARAMETER);
-        AssertReturn(cb == uLength && uWindowOff == 0, VERR_INVALID_PARAMETER);
-
-        if (uBar == VIRTIO_REGION_PCI_CAP)
-        {
-            Assert(uLength <= sizeof(u32Value));
-            virtioR3MmioWrite(pDevIns, NULL, (RTGCPHYS)((uint32_t)pVirtio->pGcPhysPciCapBase + uOffset), &u32Value, uLength);
-        }
-        else
-        {
-            Log2Func(("Guest wrote virtio_pci_cfg_cap.pci_cfg_data using unconfigured BAR. Ignoring"));
+        if (   (uLength != 1 && uLength != 2 && uLength != 4)
+            || cb != uLength
+            || uBar != VIRTIO_REGION_PCI_CAP)
+        {
+            Log2Func(("Guest write virtio_pci_cfg_cap.pci_cfg_data using mismatching config. Ignoring\n"));
             return VINF_SUCCESS;
         }
-        Log2Func(("Guest wrote  virtio_pci_cfg_cap.pci_cfg_data, bar=%d, offset=%x, length=%x, value=%d\n",
-                uBar, uOffset, uLength, u32Value));
-        return VINF_SUCCESS;
+
+        int rc = virtioR3MmioWrite(pDevIns, NULL, pVirtio->pGcPhysPciCapBase + uOffset, &u32Value, cb);
+        Log2Func(("Guest wrote  virtio_pci_cfg_cap.pci_cfg_data, bar=%d, offset=%x, length=%x, value=%d -> %Rrc\n",
+                uBar, uOffset, uLength, u32Value, rc));
+        return rc;
     }
     return VINF_PDM_PCI_DO_DEFAULT;
@@ -1173 +1170 @@
      *  initializing. */
 
+    pVirtio->uPciCfgDataOff = pCfg->uCapNext + RT_OFFSETOF(VIRTIO_PCI_CFG_CAP_T, uPciCfgData);
     pCfg = (PVIRTIO_PCI_CAP_T)&pPciDev->abConfig[pCfg->uCapNext];
     pCfg->uCfgType = VIRTIO_PCI_CAP_PCI_CFG;