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

Timestamp:

Aug 15, 2013 1:23:31 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HM: Preemption hooks.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (5 diffs)
• HMVMXR0.cpp (modified) (4 diffs)

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

@@ -1556 +1556 @@
     LogFlowFunc(("pVM=%p pVCpu=%p\n", pVM, pVCpu));
 
-    /* Nothing to do here. */
+    pVCpu->hm.s.fLeaveDone = false;
     return VINF_SUCCESS;
 }
@@ -1576 +1576 @@
     NOREF(pCtx);
 
-    /* Nothing to do here. Everything is taken care of in hmR0SvmLongJmpToRing3(). */
+    /* Nothing to do here. Everything is taken care of in hmR0SvmLeave(). */
     return VINF_SUCCESS;
 }
@@ -1887 +1887 @@
     Assert(VMMR0IsLogFlushDisabled(pVCpu));
 
+    /* Avoid repeating this work when thread-context hooks are used and we had been preempted before
+       which would've done this work from the SVMR0ThreadCtxCallback(). */
+    RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+    bool fPreemptDisabled = false;
+    if (RTThreadPreemptIsEnabled(NIL_RTTHREAD))
+    {
+        Assert(VMMR0ThreadCtxHooksAreRegistered(pVCpu));
+        RTThreadPreemptDisable(&PreemptState);
+        fPreemptDisabled = true;
+        if (pVCpu->hm.s.fLeaveDone)
+        {
+            RTThreadPreemptRestore(&PreemptState);
+            return;
+        }
+    }
+
     /* Restore host FPU state if necessary and resync on next R0 reentry .*/
     if (CPUMIsGuestFPUStateActive(pVCpu))
@@ -1912 +1928 @@
     Assert(!CPUMIsGuestDebugStateActive(pVCpu));
 
-
     STAM_PROFILE_ADV_SET_STOPPED(&pVCpu->hm.s.StatEntry);
     STAM_PROFILE_ADV_SET_STOPPED(&pVCpu->hm.s.StatLoadGuestState);
@@ -1920 +1935 @@
 
     VMCPU_CMPXCHG_STATE(pVCpu, VMCPUSTATE_STARTED_HM, VMCPUSTATE_STARTED_EXEC);
+
+    /* Restore preemption if we previous disabled it ourselves. */
+    if (fPreemptDisabled)
+    {
+        pVCpu->hm.s.fLeaveDone = true;
+        RTThreadPreemptRestore(&PreemptState);
+    }
 }
 

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

@@ -6040 +6040 @@
         RTThreadPreemptDisable(&PreemptState);
         fPreemptDisabled = true;
-        if (pVCpu->hm.s.vmx.fVmxLeaveDone)
+        if (pVCpu->hm.s.fLeaveDone)
         {
             RTThreadPreemptRestore(&PreemptState);
@@ -6094 +6094 @@
     if (fPreemptDisabled)
     {
-        pVCpu->hm.s.vmx.fVmxLeaveDone = true;
+        pVCpu->hm.s.fLeaveDone = true;
         RTThreadPreemptRestore(&PreemptState);
     }
@@ -6796 +6796 @@
     /** @todo this will change with preemption hooks where can VMRESUME as long
      *        as we're no preempted. */
-    pVCpu->hm.s.fResumeVM = false;
-    pVCpu->hm.s.vmx.fVmxLeaveDone = false;
+    pVCpu->hm.s.fResumeVM  = false;
+    pVCpu->hm.s.fLeaveDone = false;
     return VINF_SUCCESS;
 }
@@ -6848 +6848 @@
             AssertRC(rc);
 
-            pVCpu->hm.s.fResumeVM = false;
-            pVCpu->hm.s.vmx.fVmxLeaveDone = false;
+            pVCpu->hm.s.fResumeVM  = false;
+            pVCpu->hm.s.fLeaveDone = false;
             pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_HOST_CONTEXT;