Changeset 86730 in vbox for trunk/src

Timestamp:

Oct 28, 2020 10:44:37 AM (4 years ago)

Author:

vboxsync

Message:

VMM/DBGF: Move the DBGFRZ* part into VMMAll as the trap handlers will be required to work in Ring-3 before long to be able to support the IEM execute in Ring-3 and NEM cases, bugref:9837

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• VMMAll/DBGFAllBp.cpp (moved) (moved from trunk/src/VBox/VMM/VMMRZ/DBGFRZ.cpp ) (12 diffs)
• VMMR0/HMSVMR0.cpp (modified) (2 diffs)
• VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -506 +506 @@
         VMMRZ/CPUMRZ.cpp \
         VMMRZ/CPUMRZA.asm \
-        VMMRZ/DBGFRZ.cpp \
         VMMRZ/VMMRZ.cpp \
         VMMAll/APICAll.cpp \
@@ -512 +511 @@
         VMMAll/CPUMAllMsrs.cpp \
         VMMAll/DBGFAll.cpp \
+        VMMAll/DBGFAllBp.cpp \
         $(if-expr defined(VBOX_WITH_DBGF_TRACING), VMMAll/DBGFAllTracer.cpp,) \
         VMMAll/EMAll.cpp \

trunk/src/VBox/VMM/VMMAll/DBGFAllBp.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * DBGF - Debugger Facility, RZ part.
+ * DBGF - Debugger Facility, All Context breakpoint management part.
  */
 
@@ -65 +65 @@
     return &pBpChunk->paBpBaseSharedR0[idxEntry];
 }
-# endif
 
 
@@ -79 +78 @@
  * @param   pBpR0       The ring-0 only breakpoint state.
  */
-DECLINLINE(int) dbgfRZBpHit(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTXCORE pRegFrame,
+DECLINLINE(int) dbgfR0BpHit(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTXCORE pRegFrame,
                             DBGFBP hBp, PDBGFBPINT pBp, PDBGFBPINTR0 pBpR0)
 {
@@ -103 +102 @@
  * @note The content of the resolved L2 table entry is not validated!.
  */
-DECLINLINE(PCDBGFBPL2ENTRY) dbgfRZBpL2GetByIdx(PVMCC pVM, uint32_t idxL2)
+DECLINLINE(PCDBGFBPL2ENTRY) dbgfR0BpL2GetByIdx(PVMCC pVM, uint32_t idxL2)
 {
     uint32_t idChunk  = DBGF_BP_L2_IDX_GET_CHUNK_ID(idxL2);
@@ -128 +127 @@
  * @param   GCPtrKey    The key to search for.
  */
-static int dbgfRZBpL2Walk(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTXCORE pRegFrame,
-                          uint32_t idxL2Root, RTGCUINTPTR GCPtrKey)
+static int dbgfBpL2Walk(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTXCORE pRegFrame,
+                        uint32_t idxL2Root, RTGCUINTPTR GCPtrKey)
 {
     /** @todo We don't use the depth right now but abort the walking after a fixed amount of levels. */
     uint8_t iDepth = 32;
-    PCDBGFBPL2ENTRY pL2Entry = dbgfRZBpL2GetByIdx(pVM, idxL2Root);
+    PCDBGFBPL2ENTRY pL2Entry = dbgfR0BpL2GetByIdx(pVM, idxL2Root);
 
     while (RT_LIKELY(   iDepth-- > 0
@@ -153 +152 @@
             if (   pBp
                 && DBGF_BP_PUB_GET_TYPE(pBp->Pub.fFlagsAndType) == DBGFBPTYPE_INT3)
-                return dbgfRZBpHit(pVM, pVCpu, pRegFrame, hBp, pBp, pBpR0);
+                return dbgfR0BpHit(pVM, pVCpu, pRegFrame, hBp, pBp, pBpR0);
 
             /* The entry got corrupted, just abort. */
@@ -167 +166 @@
             return VINF_EM_RAW_GUEST_TRAP;
 
-        pL2Entry = dbgfRZBpL2GetByIdx(pVM, idxL2Next);
+        pL2Entry = dbgfR0BpL2GetByIdx(pVM, idxL2Next);
     }
 
     return VERR_DBGF_BP_L2_LOOKUP_FAILED;
 }
+# endif /* !IN_RING0 */
 #endif /* !VBOX_WITH_LOTS_OF_DBGF_BPS */
 
@@ -188 +188 @@
  * @param   fAltStepping    Alternative stepping indicator.
  */
-VMMRZ_INT_DECL(int) DBGFRZTrap01Handler(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6, bool fAltStepping)
+VMM_INT_DECL(int) DBGFTrap01Handler(PVM pVM, PVMCPU pVCpu, PCPUMCTXCORE pRegFrame, RTGCUINTREG uDr6, bool fAltStepping)
 {
     /** @todo Intel docs say that X86_DR6_BS has the highest priority... */
@@ -256 +256 @@
  * @param   pRegFrame   Pointer to the register frame for the trap.
  */
-VMMRZ_INT_DECL(int) DBGFRZTrap03Handler(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTXCORE pRegFrame)
+VMM_INT_DECL(int) DBGFTrap03Handler(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTXCORE pRegFrame)
 {
 #ifndef VBOX_WITH_LOTS_OF_DBGF_BPS
@@ -290 +290 @@
     }
 #else
+#ifndef IN_RING0
+# error "Todo"
+#endif
     if (pVM->dbgfr0.s.CTX_SUFF(paBpLocL1))
     {
@@ -317 +320 @@
                 {
                     if (pBp->Pub.u.Int3.GCPtr == (RTGCUINTPTR)GCPtrBp)
-                        rc = dbgfRZBpHit(pVM, pVCpu, pRegFrame, hBp, pBp, pBpR0);
+                        rc = dbgfR0BpHit(pVM, pVCpu, pRegFrame, hBp, pBp, pBpR0);
                     /* else: Genuine guest trap. */
                 }
@@ -324 +327 @@
             }
             else if (u8Type == DBGF_BP_INT3_L1_ENTRY_TYPE_L2_IDX)
-                rc = dbgfRZBpL2Walk(pVM, pVCpu, pRegFrame, DBGF_BP_INT3_L1_ENTRY_GET_L2_IDX(u32L1Entry),
-                                    DBGF_BP_INT3_L2_KEY_EXTRACT_FROM_ADDR((RTGCUINTPTR)GCPtrBp));
+                rc = dbgfBpL2Walk(pVM, pVCpu, pRegFrame, DBGF_BP_INT3_L1_ENTRY_GET_L2_IDX(u32L1Entry),
+                                  DBGF_BP_INT3_L2_KEY_EXTRACT_FROM_ADDR((RTGCUINTPTR)GCPtrBp));
             else /* Some invalid type. */
                 rc = VERR_DBGF_BP_L1_LOOKUP_FAILED;

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

@@ -7414 +7414 @@
     PSVMVMCB pVmcb = pVCpu->hm.s.svm.pVmcb;
     PCPUMCTX pCtx  = &pVCpu->cpum.GstCtx;
-    int rc = DBGFRZTrap01Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx), pVmcb->guest.u64DR6, pVCpu->hm.s.fSingleInstruction);
+    int rc = DBGFTrap01Handler(pVM, pVCpu, CPUMCTX2CORE(pCtx), pVmcb->guest.u64DR6, pVCpu->hm.s.fSingleInstruction);
     if (rc == VINF_EM_RAW_GUEST_TRAP)
     {
@@ -7478 +7478 @@
 
     PCPUMCTX pCtx = &pVCpu->cpum.GstCtx;
-    int rc = DBGFRZTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx));
+    int rc = DBGFTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx));
     if (rc == VINF_EM_RAW_GUEST_TRAP)
     {

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

@@ -13938 +13938 @@
 
     if (!pVmxTransient->fIsNestedGuest)
-        rc = DBGFRZTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx));
+        rc = DBGFTrap03Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(&pVCpu->cpum.GstCtx));
     else
         rc = VINF_EM_RAW_GUEST_TRAP;
@@ -13995 +13995 @@
     if (!pVmxTransient->fIsNestedGuest)
     {
-        rc = DBGFRZTrap01Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx), uDR6, pVCpu->hm.s.fSingleInstruction);
+        rc = DBGFTrap01Handler(pVCpu->CTX_SUFF(pVM), pVCpu, CPUMCTX2CORE(pCtx), uDR6, pVCpu->hm.s.fSingleInstruction);
 
         /*