Changeset 80706 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 10, 2019 3:47:03 PM (5 years ago)

Author:

vboxsync

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

133246

Message:

PDM: Check new device registration fields when creating the ring-0 instances. Sketched in PCI device allocation, but haven't implemented it yet. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PDMR0Device.cpp (modified) (5 diffs)
• VMMR3/PDMDevice.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -1273 +1273 @@
  * Worker for PDMR0DeviceCreate that does the actual instantiation.
  *
- * Allocates a memory object and devides it up as follows:
+ * Allocates a memory object and divides it up as follows:
  * @verbatim
- *   ----------------------
- *   ring-0 devins
- *   ----------------------
- *   ring-0 instance data
- *   ----------------------
- *   page alignment padding
- *   ----------------------
- *   ring-3 devins
- *   ----------------------
- *   ring-3 instance data
- *   ----------------------
- *  [page alignment padding] -
- *  [----------------------]  \
- *  [raw-mode devins       ]   - Optional, only when raw-mode is enabled.
- *  [----------------------]  /
- *  [raw-mode instance data] -
- *   ----------------------
- *   shared instance data
- *   ----------------------
- *   default crit section
- *   ----------------------
- * @endverbatim
+   -----------------------------------
+   ring-0 devins
+   -----------------------------------
+   ring-0 instance data
+   -----------------------------------
+   ring-0 PCI device data (optional) ?
+   -----------------------------------
+   page alignment padding
+   -----------------------------------
+   ring-3 devins
+   -----------------------------------
+   ring-3 instance data
+   -----------------------------------
+   ring-3 PCI device data (optional) ?
+   -----------------------------------
+  [page alignment padding             ] -
+  [-----------------------------------]  \
+  [raw-mode devins                    ]   \
+  [-----------------------------------]   - Optional, only when raw-mode is enabled.
+  [raw-mode instance data             ]   /
+  [-----------------------------------]  /
+  [raw-mode PCI device data (optional)] -
+   -----------------------------------
+   shared instance data
+   -----------------------------------
+   default crit section
+   -----------------------------------
+   shared PCI device data (optional)
+   -----------------------------------
+   @endverbatim
  *
  * @returns VBox status code.
@@ -1497 +1505 @@
     AssertReturn(pReq->cbInstanceRC <= _512K, VERR_OUT_OF_RANGE);
     AssertReturn(pReq->iInstance < 1024, VERR_OUT_OF_RANGE);
+    AssertReturn(pReq->iInstance < pReq->cMaxInstances, VERR_OUT_OF_RANGE);
+    AssertReturn(pReq->cMaxPciDevices <= 8, VERR_OUT_OF_RANGE);
+    AssertReturn(pReq->cMaxMsixVectors <= VBOX_MSIX_MAX_ENTRIES, VERR_OUT_OF_RANGE);
 
     /*
@@ -1551 +1562 @@
                         && pReq->fFlags           == pDevReg->fFlags
                         && pReq->fClass           == pDevReg->fClass
-                        && pReq->cMaxInstances    == pDevReg->cMaxInstances)
+                        && pReq->cMaxInstances    == pDevReg->cMaxInstances
+                        && pReq->cMaxPciDevices   == pDevReg->cMaxPciDevices
+                        && pReq->cMaxMsixVectors  == pDevReg->cMaxMsixVectors)
                     {
                         rc = pdmR0DeviceCreateWorker(pGVM, pDevReg, pReq->iInstance, pReq->fRCEnabled,
@@ -1567 +1580 @@
                                 "            fFlags: %#x vs %#x\n"
                                 "            fClass: %#x vs %#x\n"
-                                "     cMaxInstances: %#x vs %#x\n",
+                                "     cMaxInstances: %#x vs %#x\n"
+                                "    cMaxPciDevices: %#x vs %#x\n"
+                                "   cMaxMsixVectors: %#x vs %#x\n"
+                                ,
                                 pReq->szDevName,
                                 pReq->uSharedVersion,   pDevReg->uSharedVersion,
@@ -1574 +1590 @@
                                 pReq->fFlags,           pDevReg->fFlags,
                                 pReq->fClass,           pDevReg->fClass,
-                                pReq->cMaxInstances,    pDevReg->cMaxInstances));
+                                pReq->cMaxInstances,    pDevReg->cMaxInstances,
+                                pReq->cMaxPciDevices,   pDevReg->cMaxPciDevices,
+                                pReq->cMaxMsixVectors,  pDevReg->cMaxMsixVectors));
                         rc = VERR_INCOMPATIBLE_CONFIG;
                     }

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -350 +350 @@
             Req.cbInstanceR3     = pReg->cbInstanceCC;
             Req.cbInstanceRC     = pReg->cbInstanceRC;
+            Req.cMaxPciDevices   = pReg->cMaxPciDevices;
+            Req.cMaxMsixVectors  = pReg->cMaxMsixVectors;
             Req.iInstance        = paDevs[i].iInstance;
             Req.fRCEnabled       = fRCEnabled;