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

Timestamp:

Jun 15, 2018 11:00:02 AM (6 years ago)

Author:

vboxsync

Message:

EM,HM: Replaced HM exit history with the EM one. VT-x now reads TSC on every exit even when VMX_VMCS_CTRL_PROC_EXEC_RDTSC_EXIT is set. VT-x needed an API for updating the PC as RIP and CS are fetched from the VMCB. bugref:9044

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EMR3Dbg.cpp (modified) (1 diff)
• HM.cpp (modified) (4 diffs)

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

@@ -290 +290 @@
      * Register info dumpers.
      */
-    int rc = DBGFR3InfoRegisterInternalEx(pVM, "exits", "Dumps the VM-exit history.",
-                                          emR3InfoExitHistory, DBGFINFO_FLAGS_ALL_EMTS);
+    const char *pszExitsDesc = "Dumps the VM-exit history. Arguments: Number of entries; 'asc', 'ascending' or 'reverse'.";
+    int rc = DBGFR3InfoRegisterInternalEx(pVM, "exits", pszExitsDesc, emR3InfoExitHistory, DBGFINFO_FLAGS_ALL_EMTS);
+    AssertLogRelRCReturn(rc, rc);
+    rc = DBGFR3InfoRegisterInternalEx(pVM, "exithistory", pszExitsDesc, emR3InfoExitHistory, DBGFINFO_FLAGS_ALL_EMTS);
     AssertLogRelRCReturn(rc, rc);
 

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

@@ -383 +383 @@
 static DECLCALLBACK(int)  hmR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
 static DECLCALLBACK(void) hmR3InfoSvmNstGstVmcbCache(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
-static DECLCALLBACK(void) hmR3InfoExitHistory(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
+static DECLCALLBACK(void) hmR3Info(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 static DECLCALLBACK(void) hmR3InfoEventPending(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 static int                hmR3InitCPU(PVM pVM);
@@ -439 +439 @@
      * Register info handlers.
      */
-    rc = DBGFR3InfoRegisterInternalEx(pVM, "exithistory", "Dumps the HM VM-exit history.", hmR3InfoExitHistory,
-                                      DBGFINFO_FLAGS_ALL_EMTS);
+    rc = DBGFR3InfoRegisterInternalEx(pVM, "hm", "Dumps HM info.", hmR3Info, DBGFINFO_FLAGS_ALL_EMTS);
     AssertRCReturn(rc, rc);
 
@@ -3680 +3679 @@
  * @param   pszArgs     Arguments, ignored.
  */
-static DECLCALLBACK(void) hmR3InfoExitHistory(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs)
+static DECLCALLBACK(void) hmR3Info(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
     NOREF(pszArgs);
@@ -3689 +3688 @@
     if (HMIsEnabled(pVM))
     {
-        bool const fIsVtx = pVM->hm.s.vmx.fSupported;
-        const char * const *papszDesc;
-        unsigned cMaxExitDesc;
-        if (fIsVtx)
-        {
-            cMaxExitDesc = MAX_EXITREASON_VTX;
-            papszDesc    = &g_apszVTxExitReasons[0];
-            pHlp->pfnPrintf(pHlp, "CPU[%u]: VT-x VM-exit history:\n", pVCpu->idCpu);
-        }
+        if (pVM->hm.s.vmx.fSupported)
+            pHlp->pfnPrintf(pHlp, "CPU[%u]: VT-x info:\n", pVCpu->idCpu);
         else
-        {
-            cMaxExitDesc = MAX_EXITREASON_AMDV;
-            papszDesc    = &g_apszAmdVExitReasons[0];
-            pHlp->pfnPrintf(pHlp, "CPU[%u]: AMD-V #VMEXIT history:\n", pVCpu->idCpu);
-        }
-
-        pHlp->pfnPrintf(pHlp, "  idxExitHistoryFree = %u\n", pVCpu->hm.s.idxExitHistoryFree);
-        unsigned const idxLast = pVCpu->hm.s.idxExitHistoryFree > 0 ?
-                                                                    pVCpu->hm.s.idxExitHistoryFree - 1 :
-                                                                    RT_ELEMENTS(pVCpu->hm.s.auExitHistory) - 1;
-        for (unsigned i = 0; i < RT_ELEMENTS(pVCpu->hm.s.auExitHistory); i++)
-        {
-            uint16_t const uExit = pVCpu->hm.s.auExitHistory[i];
-            const char *pszExit  = NULL;
-            if (uExit <= cMaxExitDesc)
-                pszExit = papszDesc[uExit];
-            else if (!fIsVtx)
-                pszExit = hmSvmGetSpecialExitReasonDesc(uExit);
-            else
-                pszExit = NULL;
-
-            pHlp->pfnPrintf(pHlp, "  auExitHistory[%2u] = 0x%04x  %s %s\n", i, uExit, pszExit,
-                            idxLast == i ? "<-- Latest exit" : "");
-        }
-        pHlp->pfnPrintf(pHlp, "HM error = %#x (%u)\n", pVCpu->hm.s.u32HMError, pVCpu->hm.s.u32HMError);
+            pHlp->pfnPrintf(pHlp, "CPU[%u]: AMD-V info:\n", pVCpu->idCpu);
+        pHlp->pfnPrintf(pHlp, "  HM error = %#x (%u)\n", pVCpu->hm.s.u32HMError, pVCpu->hm.s.u32HMError);
     }
     else