Changeset 9063 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

May 23, 2008 8:50:12 AM (17 years ago)

Author:

vboxsync

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

31160

Message:

Workaround for #2833.

File:

• trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp (modified) (3 diffs)

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

@@ -249 +249 @@
     int rc = VERR_NO_CONT_MEMORY;
     AssertCompile(sizeof(IOPhysicalAddress) == 4);
+
+    /// @todo
+    // Use IOBufferMemoryDescriptor::inTaskWithPhysicalMask(kernel_task, kIOMemoryKernelUserShared | kIODirectionInOut,
+    //                                                      cb, (_4G - 1) ^ PAGE_OFFSET_MASK);
+#if 1 /* seems to work fine for cb == PAGE_SIZE, the other variant doesn't. */
+    IOPhysicalAddress PhysAddrIgnored = 0;
+    void *pv = IOMallocContiguous(cb, PAGE_SIZE, &PhysAddrIgnored);
+#else
     void *pv = IOMallocContiguous(cb, PAGE_SIZE, NULL);
+#endif
     if (pv)
     {
@@ -278 +287 @@
             else
             {
+                printf("rtR0MemObjNativeAllocCont: PhysAddr=%llx cb=%#x\n", (unsigned long long)PhysAddr, cb);
                 AssertMsgFailed(("PhysAddr=%llx\n", (unsigned long long)PhysAddr));
                 rc = VERR_INTERNAL_ERROR;
@@ -287 +297 @@
         IOFreeContiguous(pv, cb);
     }
+
+    /*
+     * Workaround for odd IOMallocContiguous behavior, just in case.
+     */
+    if (rc == VERR_INTERNAL_ERROR && cb <= PAGE_SIZE)
+        rc = rtR0MemObjNativeAllocCont(ppMem, cb + PAGE_SIZE, fExecutable);
     return rc;
 }