Changeset 20981 in vbox

Timestamp:

Jun 26, 2009 3:03:24 PM (16 years ago)

Author:

vboxsync

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

49189

Message:

Backed out 49187; toxic

Location:

trunk/src/VBox/VMM

Files:

• HWACCMInternal.h (modified) (1 diff)
• VMMAll/HWACCMAll.cpp (modified) (3 diffs)
• VMMR0/HWACCMR0.cpp (modified) (5 diffs)
• VMMR0/HWVMXR0.cpp (modified) (2 diffs)
• VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -575 +575 @@
     /** Currenty shadow paging mode. */
     PGMMODE                 enmShadowMode;
+
+    /** The CPU ID of the CPU currently owning the VMCS. Set in
+     * HWACCMR0Enter and cleared in HWACCMR0Leave. */
+    RTCPUID                 idEnteredCpu;
 
     /** To keep track of pending TLB shootdown pages. (SMP guest only) */

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

@@ -131 +131 @@
                 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatTlbShootdown);
 #ifdef IN_RING0
-                RTCPUID idHostCpu = pVCpu->idHostCpu;
+                RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
                 if (idHostCpu != NIL_RTCPUID)
                     RTMpPokeCpu(idHostCpu);
@@ -171 +171 @@
             STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatTlbShootdownFlush);
 #ifdef IN_RING0
-            RTCPUID idHostCpu = pVCpu->idHostCpu;
+            RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
             if (idHostCpu != NIL_RTCPUID)
                 RTMpPokeCpu(idHostCpu);
@@ -246 +246 @@
                 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatTlbShootdownFlush);
     #ifdef IN_RING0
-                RTCPUID idHostCpu = pVCpu->idHostCpu;
+                RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
                 if (idHostCpu != NIL_RTCPUID)
                     RTMpPokeCpu(idHostCpu);

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

@@ -851 +851 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
+        pVCpu->hwaccm.s.idEnteredCpu              = NIL_RTCPUID;
+
         /* Invalidate the last cpu we were running on. */
         pVCpu->hwaccm.s.idLastCpu                 = NIL_RTCPUID;
@@ -961 +963 @@
     /* Make sure we can't enter a session after we've disabled hwaccm in preparation of a suspend. */
     AssertReturn(!ASMAtomicReadBool(&HWACCMR0Globals.fSuspended), VERR_HWACCM_SUSPEND_PENDING);
-    Assert(pVCpu->idHostCpu == NIL_RTCPUID);
-
     ASMAtomicWriteBool(&pCpu->fInUse, true);
-    ASMAtomicWriteU32(&pVCpu->idHostCpu, idCpu);
+
+    AssertMsg(pVCpu->hwaccm.s.idEnteredCpu == NIL_RTCPUID, ("%d", (int)pVCpu->hwaccm.s.idEnteredCpu));
+    pVCpu->hwaccm.s.idEnteredCpu = idCpu;
 
     pCtx = CPUMQueryGuestCtxPtr(pVCpu);
@@ -998 +1000 @@
 #endif
     }
+    else
+        pVCpu->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
     return rc;
 }
@@ -1038 +1042 @@
     /* keep track of the CPU owning the VMCS for debugging scheduling weirdness and ring-3 calls. */
 #ifdef RT_STRICT
-    if (RT_UNLIKELY(    pVCpu->idHostCpu != idCpu
+    if (RT_UNLIKELY(    pVCpu->hwaccm.s.idEnteredCpu != idCpu
                     &&  RT_FAILURE(rc)))
     {
-        AssertMsgFailed(("Owner is %d, I'm %d", (int)pVCpu->idHostCpu, (int)idCpu));
+        AssertMsgFailed(("Owner is %d, I'm %d", (int)pVCpu->hwaccm.s.idEnteredCpu, (int)idCpu));
         rc = VERR_INTERNAL_ERROR;
     }
 #endif
+    pVCpu->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
 
     ASMAtomicWriteBool(&pCpu->fInUse, false);
@@ -1195 +1200 @@
         PVMCPU pVCpu = &pVM->aCpus[idCpu];
 
-        if (pVCpu->idHostCpu == idHostCpu)
+        if (pVCpu->hwaccm.s.idEnteredCpu == idHostCpu)
             return pVCpu;
     }

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

@@ -2112 +2112 @@
         if (!fStatEntryStarted) { STAM_PROFILE_ADV_START(&pVCpu->hwaccm.s.StatEntry, x); fStatEntryStarted = true; }
     });
-    AssertMsg(pVCpu->idHostCpu == RTMpCpuId(),
+    AssertMsg(pVCpu->hwaccm.s.idEnteredCpu == RTMpCpuId(),
               ("Expected %d, I'm %d; cResume=%d exitReason=%RGv exitQualification=%RGv\n",
-               (int)pVCpu->idHostCpu, (int)RTMpCpuId(), cResume, exitReason, exitQualification));
+               (int)pVCpu->hwaccm.s.idEnteredCpu, (int)RTMpCpuId(), cResume, exitReason, exitQualification));
     Assert(!HWACCMR0SuspendPending());
 
@@ -3731 +3731 @@
         VMXGetActivateVMCS(&pVCpu->hwaccm.s.vmx.lasterror.u64VMCSPhys);
         pVCpu->hwaccm.s.vmx.lasterror.ulVMCSRevision = *(uint32_t *)pVCpu->hwaccm.s.vmx.pVMCS;
-        pVCpu->hwaccm.s.vmx.lasterror.idEnteredCpu   = pVCpu->idHostCpu;
+        pVCpu->hwaccm.s.vmx.lasterror.idEnteredCpu   = pVCpu->hwaccm.s.idEnteredCpu;
         pVCpu->hwaccm.s.vmx.lasterror.idCurrentCpu   = RTMpCpuId();
     }

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

@@ -608 +608 @@
             RTCCUINTREG uFlags = ASMIntDisableFlags();
 #endif
+            ASMAtomicWriteU32(&pVCpu->idHostCpu, NIL_RTCPUID);
+
 #ifdef LOG_ENABLED
             if (pVCpu->idCpu > 0)