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

Timestamp:

Mar 11, 2015 12:54:03 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

98876

Message:

VMM: Clear idHostCpu mapping while deregistering the context-hooks rather than in HMR0Leave().
Simplified HMR0_[DISABLE|RESTORE]_PREEMPT_IF_NEEDED() and made VMMR0ThreadCtxHooksDeregister() check before deregistering the
hook rather than asking the caller to do it each time.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMR0.cpp (modified) (1 diff)
• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (2 diffs)
• VMMR0.cpp (modified) (1 diff)

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

@@ -1427 +1427 @@
     /* Clear it while leaving HM context, hmPokeCpuForTlbFlush() relies on this. */
     pVCpu->hm.s.idEnteredCpu = NIL_RTCPUID;
-
-    /* Clear the VCPU <-> host CPU mapping as we've left HM context (for the preemption hook case). */
-    ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
 
     return VINF_SUCCESS;

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

@@ -2097 +2097 @@
 
     /* Deregister hook now that we've left HM context before re-enabling preemption. */
-    if (VMMR0ThreadCtxHooksAreRegistered(pVCpu))
-        VMMR0ThreadCtxHooksDeregister(pVCpu);
+    VMMR0ThreadCtxHooksDeregister(pVCpu);
 
     /* Leave HM context. This takes care of local init (term). */
@@ -2154 +2153 @@
         CPUMR0DebugStateMaybeSaveGuestAndRestoreHost(pVCpu, false /* save DR6 */);
 
-        /* Deregister hook now that we've left HM context before re-enabling preemption. */
-        if (VMMR0ThreadCtxHooksAreRegistered(pVCpu))
-            VMMR0ThreadCtxHooksDeregister(pVCpu);
+        /* Deregister the hook now that we've left HM context before re-enabling preemption. */
+        VMMR0ThreadCtxHooksDeregister(pVCpu);
 
         /* Leave HM context. This takes care of local init (term). */

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

@@ -7108 +7108 @@
 
     /* Deregister hook now that we've left HM context before re-enabling preemption. */
-    /** @todo This is bad. Deregistering here means we need to VMCLEAR always
+    /** @todo Deregistering here means we need to VMCLEAR always
      *        (longjmp/exit-to-r3) in VT-x which is not efficient. */
-    if (VMMR0ThreadCtxHooksAreRegistered(pVCpu))
-        VMMR0ThreadCtxHooksDeregister(pVCpu);
+    VMMR0ThreadCtxHooksDeregister(pVCpu);
 
     /* Leave HM context. This takes care of local init (term). */
@@ -7278 +7277 @@
         }
 
-        if (VMMR0ThreadCtxHooksAreRegistered(pVCpu))
-            VMMR0ThreadCtxHooksDeregister(pVCpu);
+        VMMR0ThreadCtxHooksDeregister(pVCpu);
 
         HMR0LeaveCpu(pVCpu);

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

@@ -510 +510 @@
 VMMR0DECL(int) VMMR0ThreadCtxHooksDeregister(PVMCPU pVCpu)
 {
-    return RTThreadCtxHooksDeregister(pVCpu->vmm.s.hR0ThreadCtx);
+    if (pVCpu->vmm.s.hR0ThreadCtx != NIL_RTTHREADCTX)
+    {
+        Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+        int rc = RTThreadCtxHooksDeregister(pVCpu->vmm.s.hR0ThreadCtx);
+        AssertRCReturn(rc, rc);
+    }
+
+    /* Clear the VCPU <-> host CPU mapping as we've left HM context. See @bugref{7726} comment #19. */
+    ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
+    return VINF_SUCCESS;
 }