Changeset 82886 in vbox for trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp

Timestamp:

Jan 27, 2020 10:26:05 PM (5 years ago)

Author:

vboxsync

Message:

IPRt/memobj-r0drv-darwin.cpp: Turns out kIOMapPrefault wasn't allowed on kernel mappings till 10.13.x. bugref:9627

File:

• trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp (modified) (1 diff)

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

@@ -958 +958 @@
     {
         /* The kIOMapPrefault option was added in 10.10.0; causes PTEs to be populated with
-           INTEL_PTE_WIRED to be set, just like we desire (see further down). */
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-        IOMemoryMap *pMemMap = pMemToMapDarwin->pMemDesc->createMappingInTask(kernel_task,
-                                                                              0,
-                                                                              kIOMapAnywhere | kIOMapDefaultCache | kIOMapPrefault,
-                                                                              offSub,
-                                                                              cbSub);
-#elif MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+           INTEL_PTE_WIRED to be set, just like we desire (see further down).  However, till
+           10.13.0 it was not available for use on kernel mappings. Oh, fudge. */
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
         static uint32_t volatile s_fOptions = UINT32_MAX;
         uint32_t fOptions = s_fOptions;
         if (RT_UNLIKELY(fOptions == UINT32_MAX))
-            s_fOptions = fOptions = version_major >= 14 ? 0x10000000 /*kIOMapPrefault*/ : 0; /* Since 10.10.0. */
+            s_fOptions = fOptions = version_major >= 17 ? 0x10000000 /*kIOMapPrefault*/ : 0; /* Since 10.13.0 (High Sierra). */
+
         IOMemoryMap *pMemMap = pMemToMapDarwin->pMemDesc->createMappingInTask(kernel_task,
                                                                               0,