Changeset 21963 in vbox for trunk/src/VBox

Timestamp:

Aug 4, 2009 3:12:59 PM (15 years ago)

Author:

vboxsync

Message:

VMM: When we're switching to our own private stack, it must have a ring-0 mapping. fixes darwin.amd64 #DFs and #PFs when using VT-x and sometimes with raw-mode.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (3 diffs)
• VMM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/Makefile.kmk

@@ -55 +55 @@
  VMMR3_DEFS    += VBOX_WITH_PDM_ASYNC_COMPLETION
 endif
+VMMR3_DEFS.darwin = VMM_R0_SWITCH_STACK
 VMMR3_DEFS.darwin.x86 = \
         VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 \
@@ -308 +309 @@
 endif
 ifeq ($(KBUILD_TARGET_ARCH),x86)
+ VMMGC_DEFS.darwin = VMM_R0_SWITCH_STACK
  VMMGC_DEFS.darwin = \
         VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
@@ -418 +420 @@
  VMMR0_DEFS    += VBOX_WITH_MULTI_CORE
 endif
+VMMR0_DEFS.darwin = VMM_R0_SWITCH_STACK
 VMMR0_DEFS.darwin.x86 = \
         VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 \

trunk/src/VBox/VMM/VMM.cpp

@@ -241 +241 @@
 {
     int rc = VINF_SUCCESS;
+#ifdef VMM_R0_SWITCH_STACK
+    uint32_t fFlags = MMHYPER_AONR_FLAGS_KERNEL_MAPPING;
+#else
+    uint32_t fFlags = 0;
+#endif
 
     for (VMCPUID idCpu = 0; idCpu < pVM->cCPUs; idCpu++)
@@ -247 +252 @@
 
 #ifdef VBOX_STRICT_VMM_STACK
-        rc = MMR3HyperAllocOnceNoRel(pVM, PAGE_SIZE + VMM_STACK_SIZE + PAGE_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVCpu->vmm.s.pbEMTStackR3);
+        rc = MMR3HyperAllocOnceNoRelEx(pVM, PAGE_SIZE + VMM_STACK_SIZE + PAGE_SIZE, 
 #else
-        rc = MMR3HyperAllocOnceNoRel(pVM, VMM_STACK_SIZE, PAGE_SIZE, MM_TAG_VMM, (void **)&pVCpu->vmm.s.pbEMTStackR3);
-#endif
+        rc = MMR3HyperAllocOnceNoRelEx(pVM, VMM_STACK_SIZE, 
+#endif
+                                       PAGE_SIZE, MM_TAG_VMM, fFlags, (void **)&pVCpu->vmm.s.pbEMTStackR3);
         if (RT_SUCCESS(rc))
         {