Changeset 81056 in vbox

Timestamp:

Sep 27, 2019 1:11:45 PM (5 years ago)

Author:

vboxsync

Message:

IOM: Dump new-style I/O ports in the 'ioport' info item. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/IOMR0.cpp (modified) (1 diff)
• VMMR3/IOM.cpp (modified) (3 diffs)
• include/IOMInternal.h (modified) (1 diff)

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

@@ -131 +131 @@
     pGVM->iomr0.s.paIoPortRegs[hIoPorts].idxStats           = UINT16_MAX;
 #endif
+
+    pGVM->iomr0.s.paIoPortRing3Regs[hIoPorts].fRing0 = true;
+
     return VINF_SUCCESS;
 }

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

@@ -1816 +1816 @@
 static DECLCALLBACK(void) iomR3IOPortInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
+    /* No locking needed here as registerations are only happening during VMSTATE_CREATING. */
+    pHlp->pfnPrintf(pHlp,
+                    "I/O port registrations: %u (%u allocated)\n"
+                    " ## Ctx    Ports Mapping   PCI    Description\n",
+                    pVM->iom.s.cIoPortRegs, pVM->iom.s.cIoPortAlloc);
+    PIOMIOPORTENTRYR3 paRegs = pVM->iom.s.paIoPortRegs;
+    for (uint32_t i = 0; i < pVM->iom.s.cIoPortRegs; i++)
+    {
+        const char * const pszRing = paRegs[i].fRing0 ? paRegs[i].fRawMode ? "+0+C" : "+0  "
+                                   : paRegs[i].fRawMode ? "+C  " : "    ";
+        if (paRegs[i].fMapped && paRegs[i].pPciDev)
+            pHlp->pfnPrintf(pHlp, "%3u R3%s %04x  %04x-%04x pci%u/%u %s\n", paRegs[i].idxSelf, pszRing, paRegs[i].cPorts,
+                            paRegs[i].uPort, paRegs[i].uPort + paRegs[i].cPorts - 1,
+                            paRegs[i].pPciDev->idxSubDev, paRegs[i].iPciRegion, paRegs[i].pszDesc);
+        else if (paRegs[i].fMapped && !paRegs[i].pPciDev)
+            pHlp->pfnPrintf(pHlp, "%3u R3%s %04x  %04x-%04x        %s\n", paRegs[i].idxSelf, pszRing, paRegs[i].cPorts,
+                            paRegs[i].uPort, paRegs[i].uPort + paRegs[i].cPorts - 1, paRegs[i].pszDesc);
+        else if (paRegs[i].pPciDev)
+            pHlp->pfnPrintf(pHlp, "%3u R3%s %04x  unmapped  pci%u/%u %s\n", paRegs[i].idxSelf, pszRing, paRegs[i].cPorts,
+                            paRegs[i].pPciDev->idxSubDev, paRegs[i].iPciRegion, paRegs[i].pszDesc);
+        else
+            pHlp->pfnPrintf(pHlp, "%3u R3%s %04x  unmapped         %s\n",
+                            paRegs[i].idxSelf, pszRing, paRegs[i].cPorts, paRegs[i].pszDesc);
+    }
+
+    /* Legacy registration: */
     NOREF(pszArgs);
     pHlp->pfnPrintf(pHlp,
@@ -1825 +1851 @@
                     sizeof(RTHCPTR) * 2,      "Out             ",
                     sizeof(RTHCPTR) * 2,      "pvUser          ");
+    IOM_LOCK_SHARED(pVM);
     RTAvlroIOPortDoWithAll(&pVM->iom.s.pTreesR3->IOPortTreeR3, true, iomR3IOPortInfoOneR3, (void *)pHlp);
+    IOM_UNLOCK_SHARED(pVM);
 
     pHlp->pfnPrintf(pHlp,
@@ -1835 +1863 @@
                     sizeof(RTHCPTR) * 2,      "Out             ",
                     sizeof(RTHCPTR) * 2,      "pvUser          ");
+    IOM_LOCK_SHARED(pVM);
     RTAvlroIOPortDoWithAll(&pVM->iom.s.pTreesR3->IOPortTreeR0, true, iomR3IOPortInfoOneR3, (void *)pHlp);
-
-#if 0
-    pHlp->pfnPrintf(pHlp,
-                    "I/O Port GC ranges (pVM=%p)\n"
-                    "Range     %.*s %.*s %.*s %.*s Description\n",
-                    pVM,
-                    sizeof(RTRCPTR) * 2,      "pDevIns         ",
-                    sizeof(RTRCPTR) * 2,      "In              ",
-                    sizeof(RTRCPTR) * 2,      "Out             ",
-                    sizeof(RTRCPTR) * 2,      "pvUser          ");
-    RTAvlroIOPortDoWithAll(&pVM->iom.s.pTreesR3->IOPortTreeRC, true, iomR3IOPortInfoOneRC, (void *)pHlp);
-#endif
+    IOM_UNLOCK_SHARED(pVM);
 }
 

trunk/src/VBox/VMM/include/IOMInternal.h

@@ -221 +221 @@
      * Only updated when critsect is held exclusively.   */
     bool                                fMapped;
+    /** Set if there is an ring-0 entry too. */
+    bool                                fRing0;
+    /** Set if there is an raw-mode entry too. */
+    bool                                fRawMode;
+    bool                                fUnused;
     /** Same as the handle index. */
     uint16_t                            idxSelf;
 } IOMIOPORTENTRYR3;
+AssertCompileSize(IOMIOPORTENTRYR3, 9 * sizeof(RTR3PTR) + 16);
 /** Pointer to a ring-3 I/O port handle table entry. */
 typedef IOMIOPORTENTRYR3 *PIOMIOPORTENTRYR3;