Changeset 82877 in vbox for trunk/src/VBox

Timestamp:

Jan 27, 2020 1:52:44 PM (5 years ago)

Author:

vboxsync

Message:

IPRT/memobj-r0drv-darwin.cpp: Only apply the cb += PAGE_SIZE allocation fudging to snow leopard and earlier as it is not at all ideal when we allocate guest memory thru this code. bugref:9627

File:

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

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

@@ -463 +463 @@
                                        RTR0MEMOBJTYPE enmType, size_t uAlignment)
 {
-    RT_NOREF_PV(uAlignment);
     int rc;
 
@@ -475 +474 @@
      * The kIOMemoryMapperNone flag is required since 10.8.2 (IOMMU changes?).
      */
+
+    /* This is an old fudge from the snow leoard days: "Is it only on snow leopard?
+       Seen allocating memory for the VM structure, last page corrupted or
+       inaccessible."  Made it only apply to snow leopard and older for now. */
     size_t cbFudged = cb;
-    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. */
+    if (version_major >= 11 /* 10 = 10.7.x = Lion. */)
+    { /* likely */ }
+    else
          cbFudged += PAGE_SIZE;
-
-    uint64_t uAlignmentActual = uAlignment;
 
     IOOptionBits fOptions = kIOMemoryKernelUserShared | kIODirectionInOut;
@@ -490 +493 @@
        versions 10.5.0 up to 10.7.0 it was private, and 10.4.8-10.5.0 it was
        x86 only and didn't have the alignment parameter (slot was different too). */
+    uint64_t uAlignmentActual = uAlignment;
     IOBufferMemoryDescriptor *pMemDesc;
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070