Changeset 84766 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 10, 2020 5:40:13 PM (5 years ago)

Author:

vboxsync

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

138565

Message:

VMM/DBGFTracer: Add events when I/O port and MMIO regions are created, bugref:9210

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• DBGFR3Tracer.cpp (modified) (5 diffs)
• PDMDevHlpTracing.cpp (modified) (2 diffs)

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

@@ -75 +75 @@
 
 
+static const RTTRACELOGEVTITEMDESC g_DevMmioCreateEvtItems[] =
+{
+    {"hMmioRegion",    "The MMIO region handle being returned by IOM",          RTTRACELOGTYPE_UINT64,  0},
+    {"cbRegion",       "Size of the MMIO region in bytes",                      RTTRACELOGTYPE_UINT64,  0},
+    {"fIomFlags",      "Flags passed to IOM",                                   RTTRACELOGTYPE_UINT32,  0},
+    {"iPciRegion",     "PCI region used for a PCI device",                      RTTRACELOGTYPE_UINT32,  0},
+};
+
+static const RTTRACELOGEVTDESC g_DevMmioCreateEvtDesc =
+{
+    "Dev.MmioCreate",
+    "MMIO region of a device is being created",
+    RTTRACELOGEVTSEVERITY_DEBUG,
+    RT_ELEMENTS(g_DevMmioCreateEvtItems),
+    &g_DevMmioCreateEvtItems[0]
+};
+
+
 static const RTTRACELOGEVTITEMDESC g_DevMmioMapEvtItems[] =
 {
@@ -149 +167 @@
     RT_ELEMENTS(g_DevMmioFillEvtItems),
     &g_DevMmioFillEvtItems[0]
+};
+
+
+static const RTTRACELOGEVTITEMDESC g_DevIoPortCreateEvtItems[] =
+{
+    {"hIoPorts",       "The I/O port region handle being returned by IOM",      RTTRACELOGTYPE_UINT64,  0},
+    {"cPorts",         "Size of the region in number of ports",                 RTTRACELOGTYPE_UINT16,  0},
+    {"fIomFlags",      "Flags passed to IOM",                                   RTTRACELOGTYPE_UINT32,  0},
+    {"iPciRegion",     "PCI region used for a PCI device",                      RTTRACELOGTYPE_UINT32,  0},
+};
+
+static const RTTRACELOGEVTDESC g_DevIoPortCreateEvtDesc =
+{
+    "Dev.IoPortCreate",
+    "I/O port region of a device is being created",
+    RTTRACELOGEVTSEVERITY_DEBUG,
+    RT_ELEMENTS(g_DevIoPortCreateEvtItems),
+    &g_DevIoPortCreateEvtItems[0]
 };
 
@@ -560 +596 @@
             break;
         }
+        case DBGFTRACEREVT_MMIO_REGION_CREATE:
+        {
+            PCDBGFTRACEREVTMMIOCREATE pEvtMmioCreate = (PCDBGFTRACEREVTMMIOCREATE)(pEvtHdr + 1);
+
+            rc = RTTraceLogWrEvtAddL(pThis->hTraceLog, &g_DevMmioCreateEvtDesc, 0 /*fFlags*/,
+                                     pEvtHdr->idEvt, pEvtHdr->hEvtSrc, pEvtMmioCreate->hMmioRegion, pEvtMmioCreate->cbRegion,
+                                     pEvtMmioCreate->fIomFlags, pEvtMmioCreate->iPciRegion);
+            break;
+        }
         case DBGFTRACEREVT_MMIO_MAP:
         {
@@ -597 +642 @@
                                      pEvtHdr->idEvt, pEvtHdr->hEvtSrc, pEvtMmioFill->hMmioRegion, pEvtMmioFill->offMmio,
                                      pEvtMmioFill->cbItem, pEvtMmioFill->cItems, pEvtMmioFill->u32Item);
+            break;
+        }
+        case DBGFTRACEREVT_IOPORT_REGION_CREATE:
+        {
+            PCDBGFTRACEREVTIOPORTCREATE pEvtIoPortCreate = (PCDBGFTRACEREVTIOPORTCREATE)(pEvtHdr + 1);
+
+            rc = RTTraceLogWrEvtAddL(pThis->hTraceLog, &g_DevIoPortCreateEvtDesc, 0 /*fFlags*/,
+                                     pEvtHdr->idEvt, pEvtHdr->hEvtSrc, pEvtIoPortCreate->hIoPorts, pEvtIoPortCreate->cPorts,
+                                     pEvtIoPortCreate->fIomFlags, pEvtIoPortCreate->iPciRegion);
             break;
         }
@@ -1058 +1112 @@
 }
 
+
+/**
+ * Registers an I/O port region create event for the given event source.
+ *
+ * @returns VBox status code.
+ * @param   pVM                     The current context VM instance data.
+ * @param   hEvtSrc                 The event source for the posted event.
+ * @param   hRegion                 The I/O port region handle returned from IOM.
+ * @param   cPorts                  Number of ports registered.
+ * @param   fFlags                  Flags passed to IOM.
+ * @param   iPciRegion              For a PCI device the region index used for the I/O ports.
+ */
+VMMR3_INT_DECL(int) DBGFR3TracerEvtIoPortCreate(PVM pVM, DBGFTRACEREVTSRC hEvtSrc, uint64_t hRegion, RTIOPORT cPorts, uint32_t fFlags,
+                                                uint32_t iPciRegion)
+{
+    VM_ASSERT_EMT_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
+    AssertReturn(hEvtSrc != NIL_DBGFTRACEREVTSRC, VERR_INVALID_HANDLE);
+
+    PUVM pUVM = pVM->pUVM;
+    PDBGFTRACERINSR3 pThis = pUVM->dbgf.s.pTracerR3;
+
+    DBGFTRACEREVTIOPORTCREATE EvtIoPortCreate;
+    RT_ZERO(EvtIoPortCreate);
+    EvtIoPortCreate.hIoPorts   = hRegion;
+    EvtIoPortCreate.cPorts     = cPorts;
+    EvtIoPortCreate.fIomFlags  = fFlags;
+    EvtIoPortCreate.iPciRegion = iPciRegion;
+    return dbgfTracerR3EvtPostSingle(pVM, pThis, hEvtSrc, DBGFTRACEREVT_IOPORT_REGION_CREATE,
+                                     &EvtIoPortCreate, sizeof(EvtIoPortCreate), NULL /*pidEvt*/);
+}
+
+
+/**
+ * Registers an MMIO region create event for the given event source.
+ *
+ * @returns VBox status code.
+ * @param   pVM                     The current context VM instance data.
+ * @param   hEvtSrc                 The event source for the posted event.
+ * @param   hRegion                 The MMIO region handle returned from IOM.
+ * @param   cbRegion                Size of the MMIO region in bytes.
+ * @param   fFlags                  Flags passed to IOM.
+ * @param   iPciRegion              For a PCI device the region index used for the MMIO region.
+ */
+VMMR3_INT_DECL(int) DBGFR3TracerEvtMmioCreate(PVM pVM, DBGFTRACEREVTSRC hEvtSrc, uint64_t hRegion, RTGCPHYS cbRegion, uint32_t fFlags,
+                                              uint32_t iPciRegion)
+{
+    VM_ASSERT_EMT_RETURN(pVM, VERR_VM_THREAD_NOT_EMT);
+    AssertReturn(hEvtSrc != NIL_DBGFTRACEREVTSRC, VERR_INVALID_HANDLE);
+
+    PUVM pUVM = pVM->pUVM;
+    PDBGFTRACERINSR3 pThis = pUVM->dbgf.s.pTracerR3;
+
+    DBGFTRACEREVTMMIOCREATE EvtMmioCreate;
+    RT_ZERO(EvtMmioCreate);
+    EvtMmioCreate.hMmioRegion = hRegion;
+    EvtMmioCreate.cbRegion    = cbRegion;
+    EvtMmioCreate.fIomFlags   = fFlags;
+    EvtMmioCreate.iPciRegion  = iPciRegion;
+    return dbgfTracerR3EvtPostSingle(pVM, pThis, hEvtSrc, DBGFTRACEREVT_MMIO_REGION_CREATE,
+                                     &EvtMmioCreate, sizeof(EvtMmioCreate), NULL /*pidEvt*/);
+}
+

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

@@ -196 +196 @@
             pTrack->u.IoPort.pfnInStr  = pfnInStr;
             pDevIns->Internal.s.idxDbgfTraceTrackNext++;
+            DBGFR3TracerEvtIoPortCreate(pVM, pDevIns->Internal.s.hDbgfTraceEvtSrc, *phIoPorts, cPorts, fFlags, iPciRegion);
         }
     }
@@ -276 +277 @@
             pTrack->u.Mmio.pfnFill     = pfnFill;
             pDevIns->Internal.s.idxDbgfTraceTrackNext++;
+            DBGFR3TracerEvtMmioCreate(pVM, pDevIns->Internal.s.hDbgfTraceEvtSrc, *phRegion, cbRegion, fFlags, iPciRegion);
         }
     }