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

Timestamp:

Sep 23, 2019 9:36:14 AM (5 years ago)

Author:

vboxsync

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

133523

Message:

Devices/PCI: Device model refactoring, part I. bugref:9218

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio_1_0.cpp (modified) (13 diffs)
• Virtio_1_0_impl.h (modified) (1 diff)

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

@@ -545 +545 @@
  *
  * @param   pVirtio     Virtio instance state
- * @param   fWrite      If write access (otherwise read access)
+ * @param   fWrite      Set if write access, clear if read access.
  * @param   pv          Pointer to location to write to or read from
  * @param   cb          Number of bytes to read or write
  */
-static int virtioCommonCfgAccessed(PVIRTIOSTATE pVirtio, int fWrite, off_t uOffset, unsigned cb, void const *pv)
+static int virtioCommonCfgAccessed(PVIRTIOSTATE pVirtio, bool fWrite, off_t uOffset, unsigned cb, void const *pv)
 {
     int rc = VINF_SUCCESS;
@@ -765 +765 @@
     {
         uint32_t uOffset = GCPhysAddr - pVirtio->pGcPhysCommonCfg;
-        virtioCommonCfgAccessed(pVirtio, 0 /* fWrite */, uOffset, cb, (void const *)pv);
+        virtioCommonCfgAccessed(pVirtio, false /* fWrite */, uOffset, cb, (void const *)pv);
     }
     else
@@ -816 +816 @@
     {
         uint32_t uOffset = GCPhysAddr - pVirtio->pGcPhysCommonCfg;
-        virtioCommonCfgAccessed(pVirtio, 1 /* fWrite */, uOffset, cb, pv);
+        virtioCommonCfgAccessed(pVirtio, true /* fWrite */, uOffset, cb, pv);
     }
     else
@@ -884 +884 @@
 
 /**
-  * Callback function for reading from the PCI configuration space.
-  *
-  * @returns The register value.
-  * @param   pDevIns         Pointer to the device instance the PCI device
-  *                          belongs to.
-  * @param   pPciDev         Pointer to PCI device. Use pPciDev->pDevIns to get the device instance.
-  * @param   uAddress        The configuration space register address. [0..4096]
-  * @param   cb              The register size. [1,2,4]
-  *
-  * @remarks Called with the PDM lock held.  The device lock is NOT take because
-  *          that is very likely be a lock order violation.
-  */
-static DECLCALLBACK(uint32_t) virtioPciConfigRead(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
-                                       uint32_t uAddress, unsigned cb)
+ * @callback_method_impl{FNPCICONFIGRead}
+ */
+static DECLCALLBACK(VBOXSTRICTRC) virtioR3PciConfigRead(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
+                                                        uint32_t uAddress, unsigned cb, uint32_t *pu32Value)
 {
     PVIRTIOSTATE pVirtio = *PDMINS_2_DATA(pDevIns, PVIRTIOSTATE *);
-
+    RT_NOREF(pPciDev);
+
+    /** @todo r=bird: this comparison just cannot be correct.   */
     if (uAddress == (uint64_t)&pVirtio->pPciCfgCap->uPciCfgData)
     {
@@ -909 +901 @@
         uint32_t uOffset = pVirtio->pPciCfgCap->pciCap.uOffset;
         uint8_t  uBar    = pVirtio->pPciCfgCap->pciCap.uBar;
-        uint32_t pv = 0;
+        *pu32Value = 0;
         if (uBar == VIRTIO_REGION_PCI_CAP)
-            (void)virtioR3MmioRead(pDevIns, NULL, (RTGCPHYS)((uint32_t)pVirtio->pGcPhysPciCapBase + uOffset),
-                                    &pv, uLength);
+        {
+            virtioR3MmioRead(pDevIns, NULL, (RTGCPHYS)((uint32_t)pVirtio->pGcPhysPciCapBase + uOffset), pu32Value, uLength);
+            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 0;
-        }
-        Log2Func(("virtio: Guest read  virtio_pci_cfg_cap.pci_cfg_data, bar=%d, offset=%d, length=%d, result=%d\n",
-                uBar, uOffset, uLength, pv));
-        return pv;
-    }
-    return pVirtio->pfnPciConfigReadOld(pDevIns, pPciDev, uAddress, cb);
-}
-
-/**
- * Callback function for writing to the PCI configuration space.
- *
- * @returns VINF_SUCCESS or PDMDevHlpDBGFStop status.
- *
- * @param   pDevIns         Pointer to the device instance the PCI device
- *                          belongs to.
- * @param   pPciDev         Pointer to PCI device. Use pPciDev->pDevIns to get the device instance.
- * @param   uAddress        The configuration space register address. [0..4096]
- * @param   u32Value        The value that's being written. The number of bits actually used from
- *                          this value is determined by the cb parameter.
- * @param   cb              The register size. [1,2,4]
- *
- * @remarks Called with the PDM lock held.  The device lock is NOT take because
- *          that is very likely be a lock order violation.
- */
-static DECLCALLBACK(VBOXSTRICTRC) virtioPciConfigWrite(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
-                                        uint32_t uAddress, uint32_t u32Value, unsigned cb)
+        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);
 
     if (uAddress == pVirtio->uPciCfgDataOff)
@@ -955 +933 @@
         uint8_t  uBar    = pVirtio->pPciCfgCap->pciCap.uBar;
         if (uBar == VIRTIO_REGION_PCI_CAP)
-            (void)virtioR3MmioWrite(pDevIns, NULL, (RTGCPHYS)((uint32_t)pVirtio->pGcPhysPciCapBase + uOffset),
-                                    (void *)&u32Value, uLength);
+        {
+            Assert(uLength <= sizeof(u32Value));
+            virtioR3MmioWrite(pDevIns, NULL, (RTGCPHYS)((uint32_t)pVirtio->pGcPhysPciCapBase + uOffset), &u32Value, uLength);
+        }
         else
         {
@@ -966 +946 @@
         return VINF_SUCCESS;
     }
-    return pVirtio->pfnPciConfigWriteOld(pDevIns, pPciDev, uAddress, u32Value, cb);
+    return VINF_PDM_PCI_DO_DEFAULT;
 }
 
@@ -1097 +1077 @@
     {
         RTMemFree(pVirtio);
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-            N_("virtio: cannot register PCI Device")); /* can we put params in this error? */
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio: cannot register PCI Device")); /* can we put params in this error? */
     }
 
@@ -1107 +1086 @@
     {
         RTMemFree(pVirtio);
-        return PDMDEV_SET_ERROR(pDevIns, rc,
-            N_("virtio: cannot register SSM callbacks"));
-    }
-
-    PDMDevHlpPCISetConfigCallbacks(pDevIns, &pVirtio->dev,
-                virtioPciConfigRead,  &pVirtio->pfnPciConfigReadOld,
-                virtioPciConfigWrite, &pVirtio->pfnPciConfigWriteOld);
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("virtio: cannot register SSM callbacks"));
+    }
+
+    rc = PDMDevHlpPCIInterceptConfigAccesses(pDevIns, &pVirtio->dev, virtioR3PciConfigRead, virtioR3PciConfigWrite);
+    AssertRCReturnStmt(rc, RTMemFree(pVirtio), rc);
 
 
@@ -1272 +1249 @@
               "  pfnSSMDevLiveExec        = %p\n  pfnSSMDevSaveExec        = %p\n"
               "  pfnSSMDevLoadExec        = %p\n  pfnSSMDevLoadDone        = %p\n"
-              "  pfnPciConfigReadOld      = %p\n  pfnPciConfigWriteOld     = %p\n",
                     pcszCaller ? pcszCaller : "<unspecified>",
                     pVirtio->uDeviceFeatures, pVirtio->uDriverFeatures, pVirtio->uDeviceFeaturesSelect,
@@ -1283 +1259 @@
                     pVirtio->virtioCallbacks.pfnVirtioDevCapWrite, pVirtio->virtioCallbacks.pfnSSMDevLiveExec,
                     pVirtio->virtioCallbacks.pfnSSMDevSaveExec, pVirtio->virtioCallbacks.pfnSSMDevLoadExec,
-                    pVirtio->virtioCallbacks.pfnSSMDevLoadDone, pVirtio->pfnPciConfigReadOld,
-                    pVirtio->pfnPciConfigWriteOld
+                    pVirtio->virtioCallbacks.pfnSSMDevLoadDone
     ));
 
@@ -1339 +1314 @@
     rc = SSMR3PutU64(pSSM,    (uint64_t)pVirtio->virtioCallbacks.pfnSSMDevLoadExec);
     rc = SSMR3PutU64(pSSM,    (uint64_t)pVirtio->virtioCallbacks.pfnSSMDevLoadDone);
-    rc = SSMR3PutU64(pSSM,    (uint64_t)pVirtio->pfnPciConfigReadOld);
-    rc = SSMR3PutU64(pSSM,    (uint64_t)pVirtio->pfnPciConfigWriteOld);
     rc = SSMR3PutGCPhys(pSSM, pVirtio->pGcPhysCommonCfg);
     rc = SSMR3PutGCPhys(pSSM, pVirtio->pGcPhysNotifyCap);
@@ -1401 +1374 @@
         rc = SSMR3GetU64(pSSM,   (uint64_t *)&pVirtio->virtioCallbacks.pfnSSMDevLoadExec);
         rc = SSMR3GetU64(pSSM,   (uint64_t *)&pVirtio->virtioCallbacks.pfnSSMDevLoadDone);
-        rc = SSMR3GetU64(pSSM,   (uint64_t *)&pVirtio->pfnPciConfigReadOld);
-        rc = SSMR3GetU64(pSSM,   (uint64_t *)&pVirtio->pfnPciConfigWriteOld);
         rc = SSMR3GetGCPhys(pSSM, &pVirtio->pGcPhysCommonCfg);
         rc = SSMR3GetGCPhys(pSSM, &pVirtio->pGcPhysNotifyCap);

trunk/src/VBox/Devices/VirtIO/Virtio_1_0_impl.h

@@ -177 +177 @@
     VIRTQSTATE                virtqState[VIRTQ_MAX_CNT];         /**< Local impl-specific queue context         */
     VIRTIOCALLBACKS           virtioCallbacks;                   /**< Callback vectors to client                */
-
-    PFNPCICONFIGREAD          pfnPciConfigReadOld;               /**< Prev rd. cb. intercepting PCI Cfg I/O     */
-    PFNPCICONFIGWRITE         pfnPciConfigWriteOld;              /**< Prev wr. cb. intercepting PCI Cfg I/O     */
 
     PVIRTIO_PCI_CFG_CAP_T     pPciCfgCap;                        /**< Pointer to struct in configuration area   */