Changeset 86699 in vbox for trunk/include/VBox

Timestamp:

Oct 25, 2020 10:44:39 AM (5 years ago)

Author:

vboxsync

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

141083

Message:

VMM/DBGF: Updates to the new breakpoint manager, implement global breakpoint table chunk allocation and register breakpoints which should work again, bugref:9837

Location:

trunk/include/VBox

Files:

• err.h (modified) (1 diff)
• vmm/dbgf.h (modified) (7 diffs)
• vmm/gvm.h (modified) (1 diff)
• vmm/uvm.h (modified) (1 diff)
• vmm/vmm.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -331 +331 @@
 /** The breakpoint owner handle is still used by one or more breakpoints. */
 #define VERR_DBGF_OWNER_BUSY                (-1225)
+/** Internal processing error \#1 in the DBGF breakpoint manager code. */
+#define VERR_DBGF_BP_IPE_1                  (-1226)
+/** Internal processing error \#2 in the DBGF breakpoint manager code. */
+#define VERR_DBGF_BP_IPE_2                  (-1227)
+/** Internal processing error \#3 in the DBGF breakpoint manager code. */
+#define VERR_DBGF_BP_IPE_3                  (-1228)
+/** Internal processing error \#4 in the DBGF breakpoint manager code. */
+#define VERR_DBGF_BP_IPE_4                  (-1229)
+/** Internal processing error \#5 in the DBGF breakpoint manager code. */
+#define VERR_DBGF_BP_IPE_5                  (-1230)
 /** @} */
 

trunk/include/VBox/vmm/dbgf.h

@@ -86 +86 @@
 
 VMMR0_INT_DECL(int) DBGFR0TracerCreateReqHandler(PGVM pGVM, PDBGFTRACERCREATEREQ pReq);
+
+#ifdef VBOX_WITH_LOTS_OF_DBGF_BPS
+/**
+ * Request buffer for DBGFR0BpInitReqHandler / VMMR0_DO_DBGF_BP_INIT.
+ * @see DBGFR0BpInitReqHandler.
+ */
+typedef struct DBGFBPINITREQ
+{
+    /** The header. */
+    SUPVMMR0REQHDR                  Hdr;
+    /** Out: Ring-3 pointer of the L1 lookup table on success. */
+    R3PTRTYPE(volatile uint32_t *)  paBpLocL1R3;
+} DBGFBPINITREQ;
+/** Pointer to a DBGFR0BpInitReqHandler / VMMR0_DO_DBGF_BP_INIT request buffer. */
+typedef DBGFBPINITREQ *PDBGFBPINITREQ;
+
+VMMR0_INT_DECL(int) DBGFR0BpInitReqHandler(PGVM pGVM, PDBGFBPINITREQ pReq);
+
+/**
+ * Request buffer for DBGFR0BpChunkAllocReqHandler / VMMR0_DO_DBGF_CHUNK_ALLOC.
+ * @see DBGFR0BpChunkAllocReqHandler.
+ */
+typedef struct DBGFBPCHUNKALLOCREQ
+{
+    /** The header. */
+    SUPVMMR0REQHDR          Hdr;
+    /** Out: Ring-3 pointer of the chunk base on success. */
+    R3PTRTYPE(void *)       pChunkBaseR3;
+
+    /** The chunk ID to allocate. */
+    uint32_t                idChunk;
+} DBGFBPCHUNKALLOCREQ;
+/** Pointer to a DBGFR0BpChunkAllocReqHandler / VMMR0_DO_DBGF_CHUNK_ALLOC request buffer. */
+typedef DBGFBPCHUNKALLOCREQ *PDBGFBPCHUNKALLOCREQ;
+
+VMMR0_INT_DECL(int) DBGFR0BpChunkAllocReqHandler(PGVM pGVM, PDBGFBPCHUNKALLOCREQ pReq);
+#endif
 /** @} */
 
@@ -829 +866 @@
      * debugger). */
     DBGFBPOWNER     hOwner;
-    /** The breakpoint type. */
-    DBGFBPTYPE      enmType;
-    /** The breakpoint handle this state belongs to. */
-    DBGFBP          hBp;
-    /** Breakpoint flags, see DBGF_BP_F_XXX. */
-    uint32_t        fFlags;
+    /** Breakpoint type and flags, see DBGFBPTYPE for type and DBGF_BP_F_XXX for flags.
+     * Needs to be smashed together to be able to stay in the size limits. */
+    uint32_t        fFlagsAndType;
 
     /** Union of type specific data. */
@@ -889 +923 @@
 
         /** Padding to the anticipated size. */
-        uint64_t    u64Padding[3];
+        uint64_t    u64Padding[2];
     } u;
 } DBGFBPPUB;
-AssertCompileSize(DBGFBPPUB, 64);
+AssertCompileSize(DBGFBPPUB, 64 - 8);
 AssertCompileMembersAtSameOffset(DBGFBPPUB, u.GCPtr, DBGFBPPUB, u.Reg.GCPtr);
 AssertCompileMembersAtSameOffset(DBGFBPPUB, u.GCPtr, DBGFBPPUB, u.Int3.GCPtr);
@@ -901 +935 @@
 typedef const DBGFBPPUB *PCDBGFBPPUB;
 
-/** @name Possible DBGFBPPUB::fFlags flags.
+/** Sets the DBGFPUB::fFlagsAndType member. */
+#define DBGF_BP_PUB_SET_FLAGS_AND_TYPE(a_enmType, a_fFlags) ((uint32_t)(a_enmType) | (a_fFlags))
+/** Returns the type of the DBGFPUB::fFlagsAndType member. */
+#define DBGF_BP_PUB_GET_TYPE(a_fFlagsAndType) ((DBGFBPTYPE)((a_fFlagsAndType) & (UINT32_C(0x7fffffff))))
+/** Returns the enabled status of DBGFPUB::fFlagsAndType member. */
+#define DBGF_BP_PUB_IS_ENABLED(a_fFlagsAndType) RT_BOOL((DBGFBPTYPE)((a_fFlagsAndType) & DBGF_BP_F_ENABLED))
+
+/** @name Possible DBGFBPPUB::fFlagsAndType flags.
  * @{ */
+/** Default flags. */
+#define DBGF_BP_F_DEFAULT                   0
 /** Flag whether the breakpoint is enabled currently. */
-#define DBGF_BP_F_ENABLED                   RT_BIT_32(0)
+#define DBGF_BP_F_ENABLED                   RT_BIT_32(31)
 /** @} */
+
 
 /**
@@ -916 +960 @@
  * @param   pVM         The cross-context VM structure pointer.
  * @param   idCpu       ID of the vCPU triggering the breakpoint.
- * @param   pvUser      User argument of the set breakpoint.
+ * @param   pvUserBp    User argument of the set breakpoint.
+ * @param   hBp         The breakpoint handle.
  * @param   pBpPub      Pointer to the readonly public state of the breakpoint.
  *
@@ -923 +968 @@
  *          guru meditation.
  */
-typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNDBGFBPHIT,(PVM pVM, VMCPUID idCpu, void *pvUserBp, PCDBGFBPPUB pBpPub));
+typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNDBGFBPHIT,(PVM pVM, VMCPUID idCpu, void *pvUserBp, DBGFBP hBp, PCDBGFBPPUB pBpPub));
 /** Pointer to a FNDBGFBPHIT(). */
 typedef FNDBGFBPHIT *PFNDBGFBPHIT;
@@ -967 +1012 @@
  * @param   pUVM        The user mode VM handle.
  * @param   pvUser      The user argument.
- * @param   pBp         Pointer to the breakpoint information. (readonly)
- */
-typedef DECLCALLBACKTYPE(int, FNDBGFBPENUM,(PUVM pUVM, PCDBGFBPPUB pBpPub));
+ * @param   hBp         The breakpoint handle.
+ * @param   pBp         Pointer to the public breakpoint information. (readonly)
+ */
+typedef DECLCALLBACKTYPE(int, FNDBGFBPENUM,(PUVM pUVM, void *pvUser, DBGFBP hBp, PCDBGFBPPUB pBpPub));
 /** Pointer to a breakpoint enumeration callback function. */
 typedef FNDBGFBPENUM *PFNDBGFBPENUM;

trunk/include/VBox/vmm/gvm.h

@@ -234 +234 @@
         struct DBGFR0PERVM   s;
 #endif
-        uint8_t             padding[64];
+        uint8_t             padding[1024];
     } dbgfr0;
 
     /** Padding so aCpus starts on a page boundrary.  */
 #ifdef VBOX_WITH_NEM_R0
-    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024 - 256 - 64 - 2176 - 640 - 512 - 64 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
-#else
-    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024       - 64 - 2176 - 640 - 512 - 64 - 64 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024 - 256 - 64 - 2176 - 640 - 512 - 64 - 1024 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
+#else
+    uint8_t         abPadding2[4096*2 - 64 - 256 - 1024       - 64 - 2176 - 640 - 512 - 64 - 1024 - sizeof(PGVMCPU) * VMM_MAX_CPU_COUNT];
 #endif
 

trunk/include/VBox/vmm/uvm.h

@@ -148 +148 @@
         struct DBGFUSERPERVM    s;
 #endif
-        uint8_t                 padding[384];
+        uint8_t                 padding[1024];
     } dbgf;
 

trunk/include/VBox/vmm/vmm.h

@@ -431 +431 @@
     /** Call DBGFR0TraceCallReqHandler. */
     VMMR0_DO_DBGF_TRACER_CALL_REQ_HANDLER,
+    /** Call DBGFR0BpInitReqHandler(). */
+    VMMR0_DO_DBGF_BP_INIT,
+    /** Call DBGFR0BpChunkAllocReqHandler(). */
+    VMMR0_DO_DBGF_BP_CHUNK_ALLOC,
 
     /** The usual 32-bit type blow up. */