Changeset 72560 in vbox for trunk

Timestamp:

Jun 15, 2018 11:00:02 AM (7 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

Files:

• include/VBox/vmm/em.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/EMAll.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMR3/EMR3Dbg.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/HM.cpp (modified) (4 diffs)
• src/VBox/VMM/include/EMInternal.h (modified) (1 diff)
• src/VBox/VMM/include/HMInternal.h (modified) (2 diffs)

trunk/include/VBox/vmm/em.h

@@ -215 +215 @@
  *
  * @{  */
-#define EMEXIT_F_TYPE_MASK  UINT32_C(0x0fff)    /**< The exit type mask. */
-#define EMEXIT_F_KIND_EM    UINT32_C(0x0000)    /**< EMEXITTYPE */
-#define EMEXIT_F_KIND_VMX   UINT32_C(0x1000)    /**< VT-x exit codes. */
-#define EMEXIT_F_KIND_SVM   UINT32_C(0x2000)    /**< SVM exit codes. */
-#define EMEXIT_F_KIND_NEM   UINT32_C(0x3000)    /**< NEMEXITTYPE */
-#define EMEXIT_F_KIND_XCPT  UINT32_C(0x4000)    /**< Exception numbers (raw-mode). */
-#define EMEXIT_F_KIND_MASK  UINT32_C(0x7000)
-#define EMEXIT_F_CS_EIP     UINT32_C(0x8000)
+#define EMEXIT_F_TYPE_MASK      UINT32_C(0x00000fff)    /**< The exit type mask. */
+#define EMEXIT_F_KIND_EM        UINT32_C(0x00000000)    /**< EMEXITTYPE */
+#define EMEXIT_F_KIND_VMX       UINT32_C(0x00001000)    /**< VT-x exit codes. */
+#define EMEXIT_F_KIND_SVM       UINT32_C(0x00002000)    /**< SVM exit codes. */
+#define EMEXIT_F_KIND_NEM       UINT32_C(0x00003000)    /**< NEMEXITTYPE */
+#define EMEXIT_F_KIND_XCPT      UINT32_C(0x00004000)    /**< Exception numbers (raw-mode). */
+#define EMEXIT_F_KIND_MASK      UINT32_C(0x00007000)
+#define EMEXIT_F_CS_EIP         UINT32_C(0x00008000)    /**< The PC is EIP in the low dword and CS in the high. */
+#define EMEXIT_F_UNFLATTENED_PC UINT32_C(0x00010000)    /**< The PC hasn't had CS.BASE added to it. */
 /** Combines flags and exit type into EMHistoryAddExit() input. */
 #define EMEXIT_MAKE_FLAGS_AND_TYPE(a_fFlags, a_uType)   ((a_fFlags) | (uint32_t)(a_uType))
@@ -239 +240 @@
 VMMRC_INT_DECL(void)            EMRCHistoryAddExitNoTs(PVMCPU pVCpu, uint32_t uFlagsAndType, uint16_t uCs, uint32_t uEip);
 #endif
+#ifdef IN_RING0
+VMMR0_INT_DECL(void)            EMR0HistoryUpdatePC(PVMCPU pVCpu, uint64_t uFlatPC, bool fFlattened);
+#endif
+
 
 /** @name Deprecated interpretation related APIs (use IEM).

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

@@ -407 +407 @@
  *
  * @returns Suggested action to take.
- * @param   pVCpu           The corss context virtual CPU structure.
+ * @param   pVCpu           The cross context virtual CPU structure.
  * @param   uFlagsAndType   Combined flags and type (see EMEXIT_MAKE_FLAGS_AND_TYPE).
- * @param   uFlatPC         The flattened program counter (RIP).
+ * @param   uFlatPC         The flattened program counter (RIP).  UINT64_MAX if not available.
  * @param   uTimestamp      The TSC value for the exit, 0 if not available.
  * @thread  EMT(pVCpu)
@@ -446 +446 @@
  * we start seriously caring about raw-mode again, we may extend it.
  *
- * @param   pVCpu           The corss context virtual CPU structure.
+ * @param   pVCpu           The cross context virtual CPU structure.
  * @param   uFlagsAndType   Combined flags and type (see EMEXIT_MAKE_FLAGS_AND_TYPE).
  * @param   uCs             The CS.
@@ -460 +460 @@
     pHistEntry->uFlagsAndType = uFlagsAndType | EMEXIT_F_CS_EIP;
     pHistEntry->idxSlot       = UINT32_MAX;
+}
+#endif
+
+
+#ifdef IN_RING0
+/**
+ * Interface that VT-x uses to supply the PC of an exit when CS:RIP is being read.
+ *
+ * @param   pVCpu           The cross context virtual CPU structure.
+ * @param   uFlatPC         The flattened program counter (RIP).  UINT64_MAX if not available.
+ * @param   fFlattened      Set if RIP was subjected to CS.BASE, clear if not.
+ */
+VMMR0_INT_DECL(void) EMR0HistoryUpdatePC(PVMCPU pVCpu, uint64_t uFlatPC, bool fFlattened)
+{
+    AssertCompile(RT_ELEMENTS(pVCpu->em.s.aExitHistory) == 256);
+    PEMEXITENTRY pHistEntry = &pVCpu->em.s.aExitHistory[((uintptr_t)pVCpu->em.s.iNextExit - 1) & 0xff];
+    pHistEntry->uFlatPC = uFlatPC;
+    if (fFlattened)
+        pHistEntry->uFlagsAndType &= ~EMEXIT_F_UNFLATTENED_PC;
+    else
+        pHistEntry->uFlagsAndType |= EMEXIT_F_UNFLATTENED_PC;
 }
 #endif

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

@@ -1040 +1040 @@
     pVmcbCtrl->u64MSRPMPhysAddr = pVCpu->hm.s.svm.HCPhysMsrBitmap;
 
-    /* Initialize the #VMEXIT history array with end-of-array markers (UINT16_MAX). */
-    Assert(!pVCpu->hm.s.idxExitHistoryFree);
-    HMCPU_EXIT_HISTORY_RESET(pVCpu);
-
     /* Initially all VMCB clean bits MBZ indicating that everything should be loaded from the VMCB in memory. */
     Assert(pVmcbCtrl->u32VmcbCleanBits == 0);
@@ -1061 +1057 @@
         memcpy(pbMsrBitmapCur, pbMsrBitmap, SVM_MSRPM_PAGES << X86_PAGE_4K_SHIFT);
         pVmcbCtrlCur->u64MSRPMPhysAddr = pVCpuCur->hm.s.svm.HCPhysMsrBitmap;
-
-        /* Initialize the #VMEXIT history array with end-of-array markers (UINT16_MAX). */
-        Assert(!pVCpuCur->hm.s.idxExitHistoryFree);
-        HMCPU_EXIT_HISTORY_RESET(pVCpuCur);
 
         /* Initially all VMCB clean bits MBZ indicating that everything should be loaded from the VMCB in memory. */
@@ -4584 +4576 @@
 
     pSvmTransient->u64ExitCode  = pVmcbCtrl->u64ExitCode;       /* Save the #VMEXIT reason. */
-    HMCPU_EXIT_HISTORY_ADD(pVCpu, pVmcbCtrl->u64ExitCode);      /* Update the #VMEXIT history array. */
     pVmcbCtrl->u32VmcbCleanBits       = HMSVM_VMCB_CLEAN_ALL;   /* Mark the VMCB-state cache as unmodified by VMM. */
     pSvmTransient->fVectoringDoublePF = false;                  /* Vectoring double page-fault needs to be determined later. */
@@ -4611 +4602 @@
         }
     }
+
+    EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_SVM, pSvmTransient->u64ExitCode & EMEXIT_F_TYPE_MASK),
+                     pMixedCtx->cs.u64Base + pMixedCtx->rip, uHostTsc);
 }
 

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

@@ -2844 +2844 @@
         Log4(("VMXR0SetupVM: pVCpu=%p idCpu=%RU32\n", pVCpu, pVCpu->idCpu));
 
-       /* Initialize the VM-exit history array with end-of-array markers (UINT16_MAX). */
-        Assert(!pVCpu->hm.s.idxExitHistoryFree);
-        HMCPU_EXIT_HISTORY_RESET(pVCpu);
-
         /* Set revision dword at the beginning of the VMCS structure. */
         *(uint32_t *)pVCpu->hm.s.vmx.pvVmcs = MSR_IA32_VMX_BASIC_INFO_VMCS_ID(pVM->hm.s.vmx.Msrs.u64BasicInfo);
@@ -3653 +3649 @@
         Log4(("Load[%RU32]: VMX_VMCS_GUEST_RIP=%#RX64 fContextUseFlags=%#RX32\n", pVCpu->idCpu, pMixedCtx->rip,
               HMCPU_CF_VALUE(pVCpu)));
+
+        /* Update the exit history entry with the correct CS.BASE + RIP or just RIP. */
+        if (HMCPU_CF_IS_SET(pVCpu, HM_CHANGED_GUEST_SEGMENT_REGS))
+            EMR0HistoryUpdatePC(pVCpu, pMixedCtx->cs.u64Base + pMixedCtx->rip, true);
+        else
+            EMR0HistoryUpdatePC(pVCpu, pMixedCtx->rip, false);
     }
     return rc;
@@ -4594 +4596 @@
         Log4(("Load[%RU32]: CS=%#RX16 Base=%#RX64 Limit=%#RX32 Attr=%#RX32\n", pVCpu->idCpu, pMixedCtx->cs.Sel,
               pMixedCtx->cs.u64Base, pMixedCtx->cs.u32Limit, pMixedCtx->cs.Attr.u));
+
+        /* Update the exit history entry with the correct CS.BASE + RIP. */
+        if (HMCPU_CF_IS_PENDING(pVCpu, HM_CHANGED_GUEST_RIP))
+            EMR0HistoryUpdatePC(pVCpu, pMixedCtx->cs.u64Base + pMixedCtx->rip, true);
     }
 
@@ -9208 +9214 @@
 {
     NOREF(pVM);
+    uint64_t uHostTsc = ASMReadTSC();
 
     Assert(!VMMRZCallRing3IsEnabled(pVCpu));
@@ -9219 +9226 @@
 
     if (!(pVCpu->hm.s.vmx.u32ProcCtls & VMX_VMCS_CTRL_PROC_EXEC_RDTSC_EXIT))
-        TMCpuTickSetLastSeen(pVCpu, ASMReadTSC() + pVCpu->hm.s.vmx.u64TSCOffset);
+        TMCpuTickSetLastSeen(pVCpu, uHostTsc + pVCpu->hm.s.vmx.u64TSCOffset);
 
     STAM_PROFILE_ADV_STOP_START(&pVCpu->hm.s.StatInGC, &pVCpu->hm.s.StatExit1, x);
@@ -9261 +9268 @@
          *
          * See Intel spec. 26.7 "VM-Entry failures during or after loading guest state".
+         *
+         * Note! We don't have CS or RIP at this point.  Will probably address that later
+         *       by amending the history entry added here.
          */
-        HMCPU_EXIT_HISTORY_ADD(pVCpu, pVmxTransient->uExitReason);
+        EMHistoryAddExit(pVCpu, EMEXIT_MAKE_FLAGS_AND_TYPE(EMEXIT_F_KIND_SVM, pVmxTransient->uExitReason & EMEXIT_F_TYPE_MASK),
+                         UINT64_MAX, uHostTsc);
 
         if (!pVmxTransient->fVMEntryFailed)

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

trunk/src/VBox/VMM/include/EMInternal.h

@@ -306 +306 @@
 typedef struct EMEXITENTRY
 {
-    /** The flat PC (CS:EIP/RIP) address of the exit. */
+    /** The flat PC (CS:EIP/RIP) address of the exit.
+     * UINT64_MAX if not available.  */
     uint64_t        uFlatPC;
     /** The EMEXIT_MAKE_FLAGS_AND_TYPE */

trunk/src/VBox/VMM/include/HMInternal.h

@@ -128 +128 @@
 #define HMCPU_CF_VALUE(pVCpu)                     (ASMAtomicUoReadU32(&(pVCpu)->hm.s.fContextUseFlags))
 
-
-/** Resets/initializes the VM-exit/\#VMEXIT history array. */
-#define HMCPU_EXIT_HISTORY_RESET(pVCpu)           (memset(&(pVCpu)->hm.s.auExitHistory, 0xff, sizeof((pVCpu)->hm.s.auExitHistory)))
-
-/** Updates the VM-exit/\#VMEXIT history array. */
-#define HMCPU_EXIT_HISTORY_ADD(pVCpu, a_ExitReason) \
-    do { \
-        AssertMsg((pVCpu)->hm.s.idxExitHistoryFree < RT_ELEMENTS((pVCpu)->hm.s.auExitHistory), ("%u\n", (pVCpu)->hm.s.idxExitHistoryFree)); \
-        (pVCpu)->hm.s.auExitHistory[(pVCpu)->hm.s.idxExitHistoryFree++] = (uint16_t)(a_ExitReason); \
-        if ((pVCpu)->hm.s.idxExitHistoryFree == RT_ELEMENTS((pVCpu)->hm.s.auExitHistory)) \
-            (pVCpu)->hm.s.idxExitHistoryFree = 0; \
-        (pVCpu)->hm.s.auExitHistory[(pVCpu)->hm.s.idxExitHistoryFree] = UINT16_MAX; \
-    } while (0)
 
 /** Maximum number of exit reason statistics counters. */
@@ -970 +957 @@
      * HMR0Enter and cleared in HMR0Leave. */
     RTCPUID                 idEnteredCpu;
-
-    /** VT-x/AMD-V VM-exit/\#VMXEXIT history, circular array. */
-    uint16_t                auExitHistory[31];
-    /** The index of the next free slot in the history array. */
-    uint16_t                idxExitHistoryFree;
 
     /** For saving stack space, the disassembler state is allocated here instead of