Changeset 37298 in vbox

Timestamp:

Jun 1, 2011 4:30:11 PM (14 years ago)

Author:

vboxsync

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

72042

Message:

HWACCM: Added todo on race in HWACCMR0EnableAllCpus. Hide dummy methods.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HWACCMR0.cpp (modified) (4 diffs)
• include/HWACCMInternal.h (modified) (1 diff)

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

@@ -209 +209 @@
 
 
+/** @name Dummy callback handlers.
+ * @{ */
+
+static DECLCALLBACK(int) hwaccmR0DummyEnter(PVM pVM, PVMCPU pVCpu, PHWACCM_CPUINFO pCpu)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummyLeave(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummyEnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummyDisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummyInitVM(PVM pVM)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummyTermVM(PVM pVM)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummySetupVM(PVM pVM)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummyRunGuestCode(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummySaveHostState(PVM pVM, PVMCPU pVCpu)
+{
+    return VINF_SUCCESS;
+}
+
+static DECLCALLBACK(int) hwaccmR0DummyLoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    return VINF_SUCCESS;
+}
+
+/** @} */
+
+
+
 /**
  * Does global Ring-0 HWACCM initialization.
@@ -224 +281 @@
 
     /* Fill in all callbacks with placeholders. */
-    HWACCMR0Globals.pfnEnterSession     = HWACCMR0DummyEnter;
-    HWACCMR0Globals.pfnLeaveSession     = HWACCMR0DummyLeave;
-    HWACCMR0Globals.pfnSaveHostState    = HWACCMR0DummySaveHostState;
-    HWACCMR0Globals.pfnLoadGuestState   = HWACCMR0DummyLoadGuestState;
-    HWACCMR0Globals.pfnRunGuestCode     = HWACCMR0DummyRunGuestCode;
-    HWACCMR0Globals.pfnEnableCpu        = HWACCMR0DummyEnableCpu;
-    HWACCMR0Globals.pfnDisableCpu       = HWACCMR0DummyDisableCpu;
-    HWACCMR0Globals.pfnInitVM           = HWACCMR0DummyInitVM;
-    HWACCMR0Globals.pfnTermVM           = HWACCMR0DummyTermVM;
-    HWACCMR0Globals.pfnSetupVM          = HWACCMR0DummySetupVM;
+    HWACCMR0Globals.pfnEnterSession     = hwaccmR0DummyEnter;
+    HWACCMR0Globals.pfnLeaveSession     = hwaccmR0DummyLeave;
+    HWACCMR0Globals.pfnSaveHostState    = hwaccmR0DummySaveHostState;
+    HWACCMR0Globals.pfnLoadGuestState   = hwaccmR0DummyLoadGuestState;
+    HWACCMR0Globals.pfnRunGuestCode     = hwaccmR0DummyRunGuestCode;
+    HWACCMR0Globals.pfnEnableCpu        = hwaccmR0DummyEnableCpu;
+    HWACCMR0Globals.pfnDisableCpu       = hwaccmR0DummyDisableCpu;
+    HWACCMR0Globals.pfnInitVM           = hwaccmR0DummyInitVM;
+    HWACCMR0Globals.pfnTermVM           = hwaccmR0DummyTermVM;
+    HWACCMR0Globals.pfnSetupVM          = hwaccmR0DummySetupVM;
 
     /* Default is global VT-x/AMD-V init */
@@ -707 +764 @@
         return VERR_HWACCM_SUSPEND_PENDING;
 
+/** @todo r=bird: Here be dragons and they are racing one another...
+ *  The problem is that allocating memory for the 128 CPUs might take longer
+ *  than for the 2nd and 3rd cpu to get into the HWACCMR0SetupVM code. So, they
+ *  may end up there without having enabled VT-x and #UD on a VMCLEAN for
+ *  instance.   Or that's what it looks like at least. */
     if (ASMAtomicCmpXchgU32((volatile uint32_t *)&HWACCMR0Globals.enmHwAccmState, HWACCMSTATE_ENABLED, HWACCMSTATE_UNINITIALIZED))
     {
@@ -1821 +1883 @@
 #endif /* VBOX_STRICT */
 
-/* Dummy callback handlers. */
-VMMR0DECL(int) HWACCMR0DummyEnter(PVM pVM, PVMCPU pVCpu, PHWACCM_CPUINFO pCpu)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummyLeave(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummyEnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummyDisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummyInitVM(PVM pVM)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummyTermVM(PVM pVM)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummySetupVM(PVM pVM)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM, PVMCPU pVCpu)
-{
-    return VINF_SUCCESS;
-}
-
-VMMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
-{
-    return VINF_SUCCESS;
-}

trunk/src/VBox/VMM/include/HWACCMInternal.h

@@ -895 +895 @@
 #endif
 
-/* Dummy callback handlers. */
-VMMR0DECL(int) HWACCMR0DummyEnter(PVM pVM, PVMCPU pVCpu, PHWACCM_CPUINFO pCpu);
-VMMR0DECL(int) HWACCMR0DummyLeave(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
-VMMR0DECL(int) HWACCMR0DummyEnableCpu(PHWACCM_CPUINFO pCpu, PVM pVM, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
-VMMR0DECL(int) HWACCMR0DummyDisableCpu(PHWACCM_CPUINFO pCpu, void *pvPageCpu, RTHCPHYS pPageCpuPhys);
-VMMR0DECL(int) HWACCMR0DummyInitVM(PVM pVM);
-VMMR0DECL(int) HWACCMR0DummyTermVM(PVM pVM);
-VMMR0DECL(int) HWACCMR0DummySetupVM(PVM pVM);
-VMMR0DECL(int) HWACCMR0DummyRunGuestCode(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
-VMMR0DECL(int) HWACCMR0DummySaveHostState(PVM pVM, PVMCPU pVCpu);
-VMMR0DECL(int) HWACCMR0DummyLoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx);
-
 # ifdef VBOX_WITH_KERNEL_USING_XMM
 DECLASM(int)   hwaccmR0VMXStartVMWrapXMM(RTHCUINT fResume, PCPUMCTX pCtx, PVMCSCACHE pCache, PVM pVM, PVMCPU pVCpu, PFNHWACCMVMXSTARTVM pfnStartVM);