Changeset 19227 in vbox

Timestamp:

Apr 28, 2009 8:50:31 AM (16 years ago)

Author:

vboxsync

Message:

Implemented VMMGetCpu in ring 0. (SMP guests)

Location:

trunk

Files:

• include/VBox/hwaccm.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/VMMAll.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (3 diffs)

trunk/include/VBox/hwaccm.h

@@ -84 +84 @@
 VMMDECL(bool)    HWACCMIsNestedPagingActive(PVM pVM);
 VMMDECL(PGMMODE) HWACCMGetShwPagingMode(PVM pVM);
-VMMDECL(RTCPUID) HWACCMGetVMCPUId(PVM pVM);
 #else
 /* Nop in GC */
@@ -103 +102 @@
 VMMR0DECL(int)  HWACCMR0EnterSwitcher(PVM pVM, bool *pfVTxDisabled);
 VMMR0DECL(int)  HWACCMR0LeaveSwitcher(PVM pVM, bool fVTxDisabled);
+
+VMMR0DECL(PVMCPU)  HWACCMR0GetVMCPU(PVM pVM);
+VMMR0DECL(VMCPUID) HWACCMR0GetVMCPUId(PVM pVM);
+
 /** @} */
 #endif /* IN_RING0 */

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

@@ -148 +148 @@
 }
 
-#ifndef IN_RC
-/**
- * Returns the VMCPU id of the current EMT thread.
- *
- * @param   pVM         The VM to operate on.
- */
-VMMDECL(RTCPUID) HWACCMGetVMCPUId(PVM pVM)
-{
-    /* @todo */
-    Assert(pVM->cCPUs == 1);
-    return 0;
-}
-#endif

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

@@ -73 +73 @@
 
 #else  /* IN_RING0 */
-    return HWACCMGetVMCPUId(pVM);
+    return HWACCMR0GetVMCPUId(pVM);
 #endif /* IN_RING0 */
 }
@@ -101 +101 @@
 
 #else  /* IN_RING0 */
-    return &pVM->aCpus[HWACCMGetVMCPUId(pVM)];
+    return HWACCMR0GetVMCPU(pVM);
 #endif /* IN_RING0 */
 }

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

@@ -954 +954 @@
     ASMAtomicWriteBool(&pCpu->fInUse, true);
 
+    AssertMsg(pVCpu->hwaccm.s.idEnteredCpu == NIL_RTCPUID, ("%d", (int)pVCpu->hwaccm.s.idEnteredCpu));
+    pVCpu->hwaccm.s.idEnteredCpu = idCpu;
+
     pCtx = CPUMQueryGuestCtxPtr(pVCpu);
 
@@ -982 +985 @@
     if (RT_SUCCESS(rc))
     {
-        AssertMsg(pVCpu->hwaccm.s.idEnteredCpu == NIL_RTCPUID, ("%d", (int)pVCpu->hwaccm.s.idEnteredCpu));
-        pVCpu->hwaccm.s.idEnteredCpu = idCpu;
-
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
         PGMDynMapMigrateAutoSet(pVCpu);
 #endif
     }
+    else
+        pVCpu->hwaccm.s.idEnteredCpu = NIL_RTCPUID;
     return rc;
 }
@@ -1170 +1172 @@
 {
     return &HWACCMR0Globals.aCpuInfo[idCpu];
+}
+
+/**
+ * Returns the VMCPU of the current EMT thread.
+ *
+ * @param   pVM         The VM to operate on.
+ */
+VMMR0DECL(PVMCPU)  HWACCMR0GetVMCPU(PVM pVM)
+{
+    /* RTMpCpuId had better be cheap. */
+    RTCPUID idHostCpu = RTMpCpuId();
+
+    /** @todo optimize for large number of VCPUs when that becomes more common. */
+    for (unsigned idCpu=0;idCpu<pVM->cCPUs;idCpu++)
+    {
+        PVMCPU pVCpu = &pVM->aCpus[idCpu];
+
+        if (pVCpu->hwaccm.s.idEnteredCpu == idHostCpu)
+            return pVCpu;
+    }
+    AssertReleaseFailed();
+    return 0;
+}
+
+/**
+ * Returns the VMCPU id of the current EMT thread.
+ *
+ * @param   pVM         The VM to operate on.
+ */
+VMMR0DECL(VMCPUID) HWACCMR0GetVMCPUId(PVM pVM)
+{
+    PVMCPU pVCpu = HWACCMR0GetVMCPU(pVM);
+    if (pVCpu)
+        return pVCpu->idCpu;
+
+    AssertReleaseFailed();
+    return 0;
 }