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

Timestamp:

Jan 29, 2020 12:56:30 AM (5 years ago)

Author:

vboxsync

Message:

IPRT/memobj-r0drv-darwin.cpp: Don't set the kIOMemoryPhysicallyContiguous flag when MaxPhysAddr != UINT64MAX, the mask works, though only if alignment is <= 1 (checked sources, must've misread them the other day/night). This should fix the trouble we're having on the testboxes at present. Also added the kIOMemoryHostPhysicallyContiguous flag just in case the xnu code changes. bugref:9627

Location:

trunk/src/VBox/Runtime/r0drv/darwin

Files:

• memobj-r0drv-darwin.cpp (modified) (2 diffs)
• the-darwin-kernel.h (modified) (1 diff)

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

@@ -486 +486 @@
     IOOptionBits fOptions = kIOMemoryKernelUserShared | kIODirectionInOut;
     if (fContiguous)
+    {
         fOptions |= kIOMemoryPhysicallyContiguous;
+        if (   version_major > 12
+            || (version_major == 12 && version_minor >= 2) /* 10.8.2 = Mountain Kitten */ )
+            fOptions |= kIOMemoryHostPhysicallyContiguous; /* (Just to make ourselves clear, in case the xnu code changes.)  */
+    }
     if (version_major >= 12 /* 12 = 10.8.x = Mountain Kitten */)
         fOptions |= kIOMemoryMapperNone;
@@ -498 +503 @@
     if (version_major >= 11 /* 11 = 10.7.x = Lion, could probably allow 10.5.0+ here if we really wanted to. */)
     {
-        if (fContiguous || MaxPhysAddr < UINT64_MAX)
-        {
-            fOptions |= kIOMemoryPhysicallyContiguous;
-            // cannot find any evidence of this: uAlignmentActual = 1; /* PhysMask isn't respected if higher. */
+        /* Starting with 10.6.x the physical mask is ignored if alignment is higher
+           than 1.  The assumption seems to be that inTaskWithPhysicalMask() should
+           be used and the alignment inferred from the PhysMask argument. */
+        if (MaxPhysAddr != UINT64_MAX)
+        {
+            Assert(RT_ALIGN_64(PhysMask, uAlignment) == PhysMask);
+            uAlignmentActual = 1;
         }
 

trunk/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h

@@ -108 +108 @@
 /* This flag was added in 10.6, it seems.  Should be harmless in earlier
    releases... */
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1060
 # define kIOMemoryMapperNone UINT32_C(0x800)
+#endif
+
+/* This flag was added in 10.8.2, it seems. */
+#if __MAC_OS_X_VERSION_MAX_ALLOWED < 1082
+# define kIOMemoryHostPhysicallyContiguous UINT32_C(0x00000080)
 #endif