Changeset 45655 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 20, 2013 2:27:02 PM (12 years ago)

Author:

vboxsync

Message:

VMMR0/HM: Profiling longjmp round trips are less useful, adjusted STAM counters to reflect true time spent on VMXR0RunGuestCode.

• Removed excessive inlining in HMVMXR0.
• Added exit-to-ring3 stat to HWVMXR0.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMVMXR0.cpp (modified) (27 diffs)
• HWVMXR0.cpp (modified) (2 diffs)

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

@@ -2555 +2555 @@
  * @param uIntrState    The interruptibility-state to set.
  */
-DECLINLINE(int) hmR0VmxLoadGuestIntrState(PVMCPU pVCpu, uint32_t uIntrState)
+static int hmR0VmxLoadGuestIntrState(PVMCPU pVCpu, uint32_t uIntrState)
 {
     AssertMsg(!(uIntrState & 0xfffffff0), ("%#x\n", uIntrState));   /* Bits 31:4 MBZ. */
@@ -2576 +2576 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestRip(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxLoadGuestRip(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = VINF_SUCCESS;
@@ -2601 +2601 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestRsp(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxLoadGuestRsp(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = VINF_SUCCESS;
@@ -2625 +2625 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxLoadGuestRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = VINF_SUCCESS;
@@ -2671 +2671 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestRipRspRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxLoadGuestRipRspRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = hmR0VmxLoadGuestRip(pVCpu, pMixedCtx);
@@ -2693 +2693 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestControlRegs(PVMCPU pVCpu, PCPUMCTX pCtx)
+static int hmR0VmxLoadGuestControlRegs(PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     int rc  = VINF_SUCCESS;
@@ -3042 +3042 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestDebugRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxLoadGuestDebugRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     if (!(pVCpu->hm.s.fContextUseFlags & HM_CHANGED_GUEST_DEBUG))
@@ -3308 +3308 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxWriteSegmentReg(PVMCPU pVCpu, uint32_t idxSel, uint32_t idxLimit, uint32_t idxBase,
+static int hmR0VmxWriteSegmentReg(PVMCPU pVCpu, uint32_t idxSel, uint32_t idxLimit, uint32_t idxBase,
                                        uint32_t idxAccess, PCPUMSELREG pSelReg, PCPUMCTX pCtx)
 {
@@ -3360 +3360 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestSegmentRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxLoadGuestSegmentRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc  = VERR_INTERNAL_ERROR_5;
@@ -3571 +3571 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestMsrs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxLoadGuestMsrs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     AssertPtr(pVCpu);
@@ -3692 +3692 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxLoadGuestActivityState(PVMCPU pVCpu, PCPUMCTX pCtx)
+static int hmR0VmxLoadGuestActivityState(PVMCPU pVCpu, PCPUMCTX pCtx)
 {
     /** @todo See if we can make use of other states, e.g.
@@ -3718 +3718 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSetupVMRunHandler(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSetupVMRunHandler(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     if (CPUMIsGuestInLongModeEx(pMixedCtx))
@@ -4785 +4785 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestCR0(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestCR0(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = VINF_SUCCESS;
@@ -4814 +4814 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestCR4(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestCR4(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = VINF_SUCCESS;
@@ -4843 +4843 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestRip(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
-{
-    if (pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RIP)
-        return VINF_SUCCESS;
-
-    RTGCUINTREG uVal = 0;
-    int rc = VMXReadVmcsGstN(VMX_VMCS_GUEST_RIP, &uVal);
-    AssertRCReturn(rc, rc);
-    pMixedCtx->rip = uVal;
-    pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_RIP;
+static int hmR0VmxSaveGuestRip(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+{
+    int rc = VINF_SUCCESS;
+    if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RIP))
+    {
+        RTGCUINTREG uVal = 0;
+        rc = VMXReadVmcsGstN(VMX_VMCS_GUEST_RIP, &uVal);
+        AssertRCReturn(rc, rc);
+        pMixedCtx->rip = uVal;
+        pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_RIP;
+    }
     return rc;
 }
@@ -4868 +4869 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestRsp(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
-{
-    if (pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RSP)
-        return VINF_SUCCESS;
-
-    RTGCUINTREG uVal = 0;
-    int rc = VMXReadVmcsGstN(VMX_VMCS_GUEST_RSP, &uVal);
-    AssertRCReturn(rc, rc);
-    pMixedCtx->rsp = uVal;
-    pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_RSP;
+static int hmR0VmxSaveGuestRsp(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+{
+    int rc = VINF_SUCCESS;
+    if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RSP))
+    {
+        RTGCUINTREG uVal = 0;
+        rc = VMXReadVmcsGstN(VMX_VMCS_GUEST_RSP, &uVal);
+        AssertRCReturn(rc, rc);
+        pMixedCtx->rsp = uVal;
+        pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_RSP;
+    }
     return rc;
 }
@@ -4893 +4895 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
-{
-    if (pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RFLAGS)
-        return VINF_SUCCESS;
-
-    RTGCUINTREG uVal = 0;
-    int rc = VMXReadVmcsGstN(VMX_VMCS_GUEST_RFLAGS, &uVal);
-    AssertRCReturn(rc, rc);
-    pMixedCtx->rflags.u64 = uVal;
-
-    /* Undo our real-on-v86-mode changes to eflags if necessary. */
-    if (pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
-    {
-        PVM pVM = pVCpu->CTX_SUFF(pVM);
-        Assert(pVM->hm.s.vmx.pRealModeTSS);
-        Log(("Saving real-mode RFLAGS VT-x view=%#RX64\n", pMixedCtx->rflags.u64));
-        pMixedCtx->eflags.Bits.u1VM   = 0;
-        pMixedCtx->eflags.Bits.u2IOPL = pVCpu->hm.s.vmx.RealMode.eflags.Bits.u2IOPL;
-    }
-
-    pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_RFLAGS;
+static int hmR0VmxSaveGuestRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+{
+    int rc = VINF_SUCCESS;
+    if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RFLAGS))
+    {
+        RTGCUINTREG uVal = 0;
+        rc = VMXReadVmcsGstN(VMX_VMCS_GUEST_RFLAGS, &uVal);
+        AssertRCReturn(rc, rc);
+        pMixedCtx->rflags.u64 = uVal;
+
+        /* Undo our real-on-v86-mode changes to eflags if necessary. */
+        if (pVCpu->hm.s.vmx.RealMode.fRealOnV86Active)
+        {
+            PVM pVM = pVCpu->CTX_SUFF(pVM);
+            Assert(pVM->hm.s.vmx.pRealModeTSS);
+            Log(("Saving real-mode RFLAGS VT-x view=%#RX64\n", pMixedCtx->rflags.u64));
+            pMixedCtx->eflags.Bits.u1VM   = 0;
+            pMixedCtx->eflags.Bits.u2IOPL = pVCpu->hm.s.vmx.RealMode.eflags.Bits.u2IOPL;
+        }
+
+        pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_RFLAGS;
+    }
     return rc;
 }
@@ -4922 +4925 @@
  * guest-CPU context.
  */
-static int hmR0VmxSaveGuestRipRspRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+DECLINLINE(int) hmR0VmxSaveGuestRipRspRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = hmR0VmxSaveGuestRip(pVCpu, pMixedCtx);
@@ -4942 +4945 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(void) hmR0VmxSaveGuestIntrState(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static void hmR0VmxSaveGuestIntrState(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     uint32_t uIntrState = 0;
@@ -4974 +4977 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestActivityState(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestActivityState(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     /* Nothing to do for now until we make use of different guest-CPU activity state. Just update the flag. */
@@ -4994 +4997 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestSysenterMsrs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestSysenterMsrs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = VINF_SUCCESS;
@@ -5034 +5037 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestFSBaseMsr(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestFSBaseMsr(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     RTGCUINTREG uVal = 0;
@@ -5060 +5063 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestGSBaseMsr(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestGSBaseMsr(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     RTGCUINTREG uVal = 0;
@@ -5130 +5133 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestControlRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestControlRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     RTGCUINTREG uVal    = 0;
@@ -5337 +5340 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestDebugRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestDebugRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     int rc = VINF_SUCCESS;
@@ -5363 +5366 @@
  * @remarks No-long-jump zone!!!
  */
-DECLINLINE(int) hmR0VmxSaveGuestApicState(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
+static int hmR0VmxSaveGuestApicState(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
     /* Updating TPR is already done in hmR0VmxPostRunGuest(). Just update the flag. */
@@ -5716 +5719 @@
     }
 
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExit2, x);
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitIO, y1);
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitMovCRx, y2);
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitXcptNmi, y3);
     STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchLongJmpToR3);
 }

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

@@ -5053 +5053 @@
     STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExit1, x);
     STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatEntry, x);
+    STAM_COUNTER_INC(&pVCpu->hm.s.StatSwitchExitToR3);
     Log2(("X"));
     return VBOXSTRICTRC_TODO(rc);
@@ -5134 +5135 @@
     AssertRC(rc);
 
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExit2, x);
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitIO, y1);
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitMovCRx, y2);
+    STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatExitXcptNmi, y3);
     return VINF_SUCCESS;
 }