Changeset 41069 in vbox

Timestamp:

Apr 26, 2012 12:01:00 PM (12 years ago)

Author:

vboxsync

Message:

GMMR0,memobj-r0drv-darwin.cpp: Moved the allocate fudge factor from GMMR0 to the darwin code. Mystery still unsolved, thought to be related to various panics as well.

Location:

trunk/src/VBox

Files:

• Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp (modified) (3 diffs)
• VMM/VMMR0/GVMMR0.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp

@@ -426 +426 @@
      * The kIOMemoryKernelUserShared flag just forces the result to be page aligned.
      */
+#if 1 /** @todo Figure out why this is broken. Is it only on snow leopard? Seen allocating memory for the VM structure, last page corrupted or inaccessible. */
+    size_t const cbFudged = cb + PAGE_SIZE;
+#else
+    size_t const cbFudged = cb;
+#endif
     int rc;
     IOBufferMemoryDescriptor *pMemDesc =
@@ -432 +437 @@
                                                          | kIODirectionInOut
                                                          | (fContiguous ? kIOMemoryPhysicallyContiguous : 0),
-                                                         cb,
+                                                         cbFudged,
                                                          PhysMask);
     if (pMemDesc)
@@ -439 +444 @@
         if (IORet == kIOReturnSuccess)
         {
-            void *pv = pMemDesc->getBytesNoCopy(0, cb);
+            void *pv = pMemDesc->getBytesNoCopy(0, cbFudged);
             if (pv)
             {

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

@@ -821 +821 @@
                         const uint32_t  cbVM   = RT_UOFFSETOF(VM, aCpus[cCpus]);
                         const uint32_t  cPages = RT_ALIGN_32(cbVM, PAGE_SIZE) >> PAGE_SHIFT;
-#ifdef RT_OS_DARWIN /** @todo Figure out why this is broken. Is it only on snow leopard? */
-                        rc = RTR0MemObjAllocLow(&pGVM->gvmm.s.VMMemObj, (cPages + 1) << PAGE_SHIFT, false /* fExecutable */);
-#else
                         rc = RTR0MemObjAllocLow(&pGVM->gvmm.s.VMMemObj, cPages << PAGE_SHIFT, false /* fExecutable */);
-#endif
                         if (RT_SUCCESS(rc))
                         {