Changeset 48262 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Sep 4, 2013 12:01:35 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HM: Preempt stats and minor optimizations to VT-x when thread-context hooks are used.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (1 diff)
• HMVMXR0.cpp (modified) (9 diffs)

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

@@ -1627 +1627 @@
 
             VMMRZCallRing3Enable(pVCpu);                         /* Restore longjmp state. */
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatPreemptPreempting);
             break;
         }

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

@@ -7006 +7006 @@
         case RTTHREADCTXEVENT_PREEMPTING:
         {
-            /** @todo Stats. */
             Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
             Assert(VMMR0ThreadCtxHooksAreRegistered(pVCpu));
@@ -7031 +7030 @@
             /* Restore longjmp state. */
             VMMRZCallRing3Enable(pVCpu);
+            STAM_COUNTER_INC(&pVCpu->hm.s.StatPreemptPreempting);
             break;
         }
@@ -7036 +7036 @@
         case RTTHREADCTXEVENT_RESUMED:
         {
-            /** @todo Stats. */
             Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
             Assert(VMMR0ThreadCtxHooksAreRegistered(pVCpu));
@@ -7060 +7059 @@
             }
             pVCpu->hm.s.fLeaveDone = false;
+
+            /* Restore longjmp state. */
             VMMRZCallRing3Enable(pVCpu);
             break;
@@ -7119 +7120 @@
     LogFlowFunc(("pVM=%p pVCpu=%p\n", pVM, pVCpu));
 
-    /* When thread-context hooks are available, this is done later (when preemption/interrupts are disabled). */
-    if (!VMMR0ThreadCtxHooksAreRegistered(pVCpu))
-    {
-        Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
-        return hmR0VmxSaveHostState(pVM, pVCpu);
-    }
-    return VINF_SUCCESS;
+    /* Save the host state here while entering HM context. When thread-context hooks are used, we might get preempted
+       and have to resave the host state but most of the time we won't be, so do it here before we disable interrupts. */
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+    return hmR0VmxSaveHostState(pVM, pVCpu);
 }
 
@@ -7466 +7464 @@
 
     /*
-     * Load the host state bits as we may've been preempted (only happens when
-     * thread-context hooks are used).
-     */
-    if (pVCpu->hm.s.fContextUseFlags & HM_CHANGED_HOST_CONTEXT)
-    {
-        Assert(VMMR0ThreadCtxHooksAreRegistered(pVCpu));
-        int rc = hmR0VmxSaveHostState(pVM, pVCpu);
-        AssertRC(rc);
-    }
-    Assert(!(pVCpu->hm.s.fContextUseFlags & HM_CHANGED_HOST_CONTEXT));
-
-    /*
      * If we are injecting events to a real-on-v86 mode guest, we may have to update
      * RIP and some other registers, i.e. hmR0VmxInjectPendingEvent()->hmR0VmxInjectEventVmcs().
@@ -7489 +7475 @@
     }
 
-    /* Load the state shared between host and guest (FPU, debug). */
+    /*
+     * Load the host state bits as we may've been preempted (only happens when
+     * thread-context hooks are used).
+     */
+    if (pVCpu->hm.s.fContextUseFlags & HM_CHANGED_HOST_CONTEXT)
+    {
+        Assert(VMMR0ThreadCtxHooksAreRegistered(pVCpu));
+        int rc = hmR0VmxSaveHostState(pVM, pVCpu);
+        AssertRC(rc);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatPreemptSaveHostState);
+    }
+    Assert(!(pVCpu->hm.s.fContextUseFlags & HM_CHANGED_HOST_CONTEXT));
+
+    /*
+     * Load the state shared between host and guest (FPU, debug).
+     */
     if (pVCpu->hm.s.fContextUseFlags & HM_CHANGED_HOST_GUEST_SHARED_STATE)
         hmR0VmxLoadSharedState(pVM, pVCpu, pMixedCtx);
@@ -7501 +7502 @@
 
     PHMGLOBALCPUINFO pCpu = HMR0GetCurrentCpu();
-    RTCPUID idCurrentCpu  = pCpu->idCpu;
+    RTCPUID  idCurrentCpu = pCpu->idCpu;
     if (   pVmxTransient->fUpdateTscOffsettingAndPreemptTimer
         || idCurrentCpu != pVCpu->hm.s.idLastCpu)
@@ -7511 +7512 @@
     ASMAtomicWriteBool(&pVCpu->hm.s.fCheckedTLBFlush, true);    /* Used for TLB-shootdowns, set this across the world switch. */
     hmR0VmxFlushTaggedTlb(pVCpu, pCpu);                         /* Invalidate the appropriate guest entries from the TLB. */
-
     Assert(idCurrentCpu == pVCpu->hm.s.idLastCpu);
     pVCpu->hm.s.vmx.LastError.idCurrentCpu = idCurrentCpu;      /* Update the error reporting info. with the current host CPU. */