Changeset 73348 in vbox

Timestamp:

Jul 25, 2018 9:25:45 AM (7 years ago)

Author:

vboxsync

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

123962

Message:

DBGF,DBGC,GIMHv: Added some basic windows bug check formatting (DBGFR3FormatBugCheck). Extended DBGFEventGenericWithArgs and DBGFEVENT to hold up to 6 64-bit arguments, so that we can pass all the bug check arguments to the debugger.

Location:

trunk

Files:

• include/VBox/vmm/dbgf.h (modified) (5 diffs)
• src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (1 diff)
• src/VBox/Debugger/DBGCInternal.h (modified) (1 diff)
• src/VBox/Debugger/DBGConsole.cpp (modified) (1 diff)
• src/VBox/Debugger/testcase/tstDBGCStubs.cpp (modified) (1 diff)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/VMMAll/DBGFAll.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMAll/GIMAllHv.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/DBGFR3BugCheck.cpp (added)

trunk/include/VBox/vmm/dbgf.h

@@ -500 +500 @@
         struct DBGFEVENTGENERIC
         {
-            /** Argument. */
-            uint64_t                uArg;
+            /** Number of arguments. */
+            uint8_t                 cArgs;
+            /** Alignmnet padding. */
+            uint8_t                 uPadding[7];
+            /** Arguments. */
+            uint64_t                auArgs[6];
         } Generic;
 
         /** Padding for ensuring that the structure is 8 byte aligned. */
-        uint64_t        au64Padding[4];
+        uint64_t        au64Padding[7];
     } u;
 } DBGFEVENT;
@@ -532 +536 @@
 VMMR3_INT_DECL(void)    DBGFR3PowerOff(PVM pVM);
 VMMR3_INT_DECL(void)    DBGFR3Relocate(PVM pVM, RTGCINTPTR offDelta);
+
 VMMR3_INT_DECL(int)     DBGFR3VMMForcedAction(PVM pVM, PVMCPU pVCpu);
 VMMR3_INT_DECL(VBOXSTRICTRC)    DBGFR3EventHandlePending(PVM pVM, PVMCPU pVCpu);
@@ -541 +546 @@
 VMMR3_INT_DECL(int)     DBGFR3EventAssertion(PVM pVM, DBGFEVENTTYPE enmEvent, const char *pszMsg1, const char *pszMsg2);
 VMMR3_INT_DECL(int)     DBGFR3EventBreakpoint(PVM pVM, DBGFEVENTTYPE enmEvent);
+
 VMMR3_INT_DECL(int)     DBGFR3PrgStep(PVMCPU pVCpu);
 
@@ -885 +891 @@
 VMM_INT_DECL(bool)          DBGFIsStepping(PVMCPU pVCpu);
 VMM_INT_DECL(VBOXSTRICTRC)  DBGFBpCheckIo(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, RTIOPORT uIoPort, uint8_t cbValue);
-VMM_INT_DECL(VBOXSTRICTRC)  DBGFEventGenericWithArg(PVM pVM, PVMCPU pVCpu, DBGFEVENTTYPE enmEvent, uint64_t uEventArg,
-                                                    DBGFEVENTCTX enmCtx);
+VMM_INT_DECL(VBOXSTRICTRC)  DBGFEventGenericWithArgs(PVM pVM, PVMCPU pVCpu, DBGFEVENTTYPE enmEvent, DBGFEVENTCTX enmCtx,
+                                                     unsigned cArgs, ...);
 
 
@@ -2707 +2713 @@
 /** @} */
 
+
+/** @defgroup grp_dbgf_misc  Misc DBGF interfaces.
+ * @{ */
+VMMR3DECL(int)               DBGFR3FormatBugCheck(PUVM pUVM, char *pszDetails, size_t cbDetails,
+                                                  uint64_t uP0, uint64_t uP1, uint64_t uP2, uint64_t uP3, uint64_t uP4);
+/** @} */
 #endif /* IN_RING3 */
 

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -624 +624 @@
     { DBGFEVENT_MEMORY_UNASSIGNED,      "mmio_unassigned",      NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },
     { DBGFEVENT_MEMORY_ROM_WRITE,       "rom_write",            NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },
-    { DBGFEVENT_BSOD_MSR,               "bsod_msr",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },
-    { DBGFEVENT_BSOD_EFI,               "bsod_efi",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, 0,                    NULL },
+    { DBGFEVENT_BSOD_MSR,               "bsod_msr",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, DBGCSXEVT_F_BUGCHECK, NULL },
+    { DBGFEVENT_BSOD_EFI,               "bsod_efi",             NULL,       kDbgcSxEventKind_Plain,     kDbgcEvtState_Disabled, DBGCSXEVT_F_BUGCHECK, NULL },
 };
 /** Number of entries in g_aDbgcSxEvents.  */

trunk/src/VBox/Debugger/DBGCInternal.h

@@ -424 +424 @@
  * @{ */
 #define DBGCSXEVT_F_TAKE_ARG        RT_BIT_32(0)
+/** Windows bugcheck, should take 5 arguments. */
+#define DBGCSXEVT_F_BUGCHECK        RT_BIT_32(1)
 /** @} */
 

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -815 +815 @@
                 {
                     Assert(pEvtDesc->pszDesc);
+                    Assert(pEvent->u.Generic.cArgs == 1);
                     rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: %s no %#llx! (%s)\n",
-                                                 pEvtDesc->pszDesc, pEvent->u.Generic.uArg, pEvtDesc->pszName);
+                                                 pEvtDesc->pszDesc, pEvent->u.Generic.auArgs[0], pEvtDesc->pszName);
+                }
+                else if (pEvtDesc->fFlags & DBGCSXEVT_F_BUGCHECK)
+                {
+                    Assert(pEvent->u.Generic.cArgs >= 5);
+                    char szDetails[512];
+                    DBGFR3FormatBugCheck(pDbgc->pUVM, szDetails, sizeof(szDetails), pEvent->u.Generic.auArgs[0],
+                                         pEvent->u.Generic.auArgs[1], pEvent->u.Generic.auArgs[2],
+                                         pEvent->u.Generic.auArgs[3], pEvent->u.Generic.auArgs[4]);
+                    rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: %s %s%s!\n%s", pEvtDesc->pszName,
+                                                 pEvtDesc->pszDesc ? "- " : "", pEvtDesc->pszDesc ? pEvtDesc->pszDesc : "",
+                                                 szDetails);
                 }
                 else if (   (pEvtDesc->fFlags & DBGCSXEVT_F_TAKE_ARG)
-                         || pEvent->u.Generic.uArg != 0)
+                         || pEvent->u.Generic.cArgs > 1
+                         || (   pEvent->u.Generic.cArgs == 1
+                             && pEvent->u.Generic.auArgs[0] != 0))
                 {
                     if (pEvtDesc->pszDesc)
-                        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: %s - %s! arg=%#llx\n",
-                                                     pEvtDesc->pszName, pEvtDesc->pszDesc, pEvent->u.Generic.uArg);
+                        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: %s - %s!",
+                                                     pEvtDesc->pszName, pEvtDesc->pszDesc);
                     else
-                        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: %s! arg=%#llx\n",
-                                                     pEvtDesc->pszName, pEvent->u.Generic.uArg);
+                        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\ndbgf event: %s!", pEvtDesc->pszName);
+                    if (pEvent->u.Generic.cArgs <= 1)
+                        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, " arg=%u%#llx\n", pEvent->u.Generic.auArgs[0]);
+                    else
+                    {
+                        for (uint32_t i = 0; i < pEvent->u.Generic.cArgs; i++)
+                            rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, " args[%u]=%#llx", i, pEvent->u.Generic.auArgs[i]);
+                        rc = pDbgc->CmdHlp.pfnPrintf(&pDbgc->CmdHlp, NULL, "\n");
+                    }
                 }
                 else

trunk/src/VBox/Debugger/testcase/tstDBGCStubs.cpp

@@ -545 +545 @@
 }
 
+VMMR3DECL(int) DBGFR3FormatBugCheck(PUVM pUVM, char *pszDetails, size_t cbDetails,
+                                    uint64_t uP0, uint64_t uP1, uint64_t uP2, uint64_t uP3, uint64_t uP4)
+{
+    pszDetails[0] = '\0';
+    return VERR_INTERNAL_ERROR;
+}
+
 #include <VBox/vmm/cfgm.h>
 VMMR3DECL(int) CFGMR3ValidateConfig(PCFGMNODE pNode, const char *pszNode,

trunk/src/VBox/VMM/Makefile.kmk

@@ -93 +93 @@
         VMMR3/DBGFAddrSpace.cpp \
         VMMR3/DBGFBp.cpp \
+        VMMR3/DBGFR3BugCheck.cpp \
         VMMR3/DBGFCoreWrite.cpp \
         VMMR3/DBGFCpu.cpp \

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

@@ -27 +27 @@
 #include <iprt/assert.h>
 #include <iprt/asm.h>
+#include <iprt/stdarg.h>
 
 
@@ -313 +314 @@
  * @retval  VINF_EM_DBG_EVENT if the event was raised and the caller should
  *          return ASAP to the debugger (via EM).  We set VMCPU_FF_DBGF so, it
- *          is okay not to pass this along in some situations  .
+ *          is okay not to pass this along in some situations.
  * @retval  VINF_SUCCESS if the event was disabled or ignored.
  *
@@ -319 +320 @@
  * @param   pVCpu               The cross context virtual CPU structure.
  * @param   enmEvent            The generic event being raised.
+ * @param   enmCtx              The context in which this event is being raised.
+ * @param   cArgs               Number of arguments (0 - 6).
  * @param   uEventArg           The argument of that event.
- * @param   enmCtx              The context in which this event is being raised.
  *
  * @thread  EMT(pVCpu)
  */
-VMM_INT_DECL(VBOXSTRICTRC) DBGFEventGenericWithArg(PVM pVM, PVMCPU pVCpu, DBGFEVENTTYPE enmEvent, uint64_t uEventArg,
-                                                   DBGFEVENTCTX enmCtx)
-{
+VMM_INT_DECL(VBOXSTRICTRC) DBGFEventGenericWithArgs(PVM pVM, PVMCPU pVCpu, DBGFEVENTTYPE enmEvent, DBGFEVENTCTX enmCtx,
+                                                    unsigned cArgs, ...)
+{
+    Assert(cArgs < RT_ELEMENTS(pVCpu->dbgf.s.aEvents[0].Event.u.Generic.auArgs));
+
     /*
      * Is it enabled.
      */
-    if (dbgfEventIsGenericWithArgEnabled(pVM, enmEvent, uEventArg))
+    va_list va;
+    va_start(va, cArgs);
+    uint64_t uEventArg0 = cArgs ? va_arg(va, uint64_t) : 0;
+    if (dbgfEventIsGenericWithArgEnabled(pVM, enmEvent, uEventArg0))
     {
         /*
@@ -346 +353 @@
                 {
                     pVCpu->dbgf.s.aEvents[i].enmState = DBGFEVENTSTATE_RESTORABLE;
+                    va_end(va);
                     return VINF_SUCCESS;
                 }
@@ -381 +389 @@
         pVCpu->dbgf.s.aEvents[i].Event.enmType          = enmEvent;
         pVCpu->dbgf.s.aEvents[i].Event.enmCtx           = enmCtx;
-        pVCpu->dbgf.s.aEvents[i].Event.u.Generic.uArg   = uEventArg;
+        pVCpu->dbgf.s.aEvents[i].Event.u.Generic.cArgs  = cArgs;
+        pVCpu->dbgf.s.aEvents[i].Event.u.Generic.auArgs[0] = uEventArg0;
+        if (cArgs > 1)
+        {
+            AssertStmt(cArgs < RT_ELEMENTS(pVCpu->dbgf.s.aEvents[i].Event.u.Generic.auArgs),
+                       cArgs = RT_ELEMENTS(pVCpu->dbgf.s.aEvents[i].Event.u.Generic.auArgs));
+            for (unsigned iArg = 1; iArg < cArgs; iArg++)
+                pVCpu->dbgf.s.aEvents[i].Event.u.Generic.auArgs[iArg] = va_arg(va, uint64_t);
+        }
         pVCpu->dbgf.s.cEvents = i + 1;
 
         VMCPU_FF_SET(pVCpu, VMCPU_FF_DBGF);
+        va_end(va);
         return VINF_EM_DBG_EVENT;
     }
 
+    va_end(va);
     return VINF_SUCCESS;
 }

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

@@ -934 +934 @@
                 LogRel(("GIM: HyperV: Guest indicates a fatal condition! P0=%#RX64 P1=%#RX64 P2=%#RX64 P3=%#RX64 P4=%#RX64\n",
                         pHv->uCrashP0Msr, pHv->uCrashP1Msr, pHv->uCrashP2Msr, pHv->uCrashP3Msr, pHv->uCrashP4Msr));
+                char szDetails[512];
+                DBGFR3FormatBugCheck(pVM->pUVM, szDetails, sizeof(szDetails), pHv->uCrashP0Msr, pHv->uCrashP1Msr,
+                                     pHv->uCrashP2Msr, pHv->uCrashP3Msr, pHv->uCrashP4Msr);
+                LogRel(("%s", szDetails));
 
                 if (DBGF_IS_EVENT_ENABLED(pVM, DBGFEVENT_BSOD_MSR))
-                    DBGFEventGenericWithArg(pVM, pVCpu, DBGFEVENT_BSOD_MSR, pHv->uCrashP0Msr, DBGFEVENTCTX_OTHER);
+                    DBGFEventGenericWithArgs(pVM, pVCpu, DBGFEVENT_BSOD_MSR, DBGFEVENTCTX_OTHER, 5 /*cArgs*/, pHv->uCrashP0Msr,
+                                             pHv->uCrashP1Msr, pHv->uCrashP2Msr, pHv->uCrashP3Msr, pHv->uCrashP4Msr);
                 /* (Do not try pass VINF_EM_DBG_EVENT, doesn't work from here!) */
             }

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

@@ -9556 +9556 @@
         && DBGF_IS_EVENT_ENABLED(pVM, enmEvent1))
     {
-        VBOXSTRICTRC rcStrict = DBGFEventGenericWithArg(pVM, pVCpu, enmEvent1, uEventArg, DBGFEVENTCTX_HM);
+        VBOXSTRICTRC rcStrict = DBGFEventGenericWithArgs(pVM, pVCpu, enmEvent1, DBGFEVENTCTX_HM, 1, uEventArg);
         if (rcStrict != VINF_SUCCESS)
             return rcStrict;
@@ -9563 +9563 @@
              && DBGF_IS_EVENT_ENABLED(pVM, enmEvent2))
     {
-        VBOXSTRICTRC rcStrict = DBGFEventGenericWithArg(pVM, pVCpu, enmEvent2, uEventArg, DBGFEVENTCTX_HM);
+        VBOXSTRICTRC rcStrict = DBGFEventGenericWithArgs(pVM, pVCpu, enmEvent2, DBGFEVENTCTX_HM, 1, uEventArg);
         if (rcStrict != VINF_SUCCESS)
             return rcStrict;