Changeset 100435 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 7, 2023 1:48:03 PM (21 months ago)

Author:

vboxsync

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

158175

Message:

Linux: iprt: r0drv/linux/memobj-r0drv-linux.c: Introduce initial support for kernel 6.5, bugref:10482.

File:

• trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (8 diffs)

trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

@@ -1263 +1263 @@
 # endif
 
-# if RTLNX_VER_MIN(2,5,5) || defined(pte_offset_map) /* As usual, RHEL 3 had pte_offset_map earlier. */
+# if RTLNX_VER_MIN(6,5,0)
+    pEntry = __pte_map(&u.Middle, ulAddr);
+# elif RTLNX_VER_MIN(2,5,5) || defined(pte_offset_map) /* As usual, RHEL 3 had pte_offset_map earlier. */
     pEntry = pte_offset_map(&u.Middle, ulAddr);
 # else
@@ -1364 +1366 @@
     }
 
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
     papVMAs = (struct vm_area_struct **)RTMemAlloc(sizeof(*papVMAs) * cPages);
     if (papVMAs)
     {
+# else
+        RT_NOREF(papVMAs);
+# endif
         LNX_MM_DOWN_READ(pTask->mm);
 
@@ -1385 +1391 @@
                                 fWrite,                 /* force write access. */
 # endif
-                                &pMemLnx->apPages[0],   /* Page array. */
-                                papVMAs);               /* vmas */
+                                &pMemLnx->apPages[0]    /* Page array. */
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+                                , papVMAs               /* vmas */
+# endif
+                                );
         /*
          * Actually this should not happen at the moment as call this function
@@ -1407 +1416 @@
                                 fWrite,                 /* force write access. */
 # endif
-                                &pMemLnx->apPages[0],   /* Page array. */
-                                papVMAs                 /* vmas */
+                                &pMemLnx->apPages[0]    /* Page array. */
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+                                , papVMAs               /* vmas */
+# endif
 # if GET_USER_PAGES_API >= KERNEL_VERSION(4, 10, 0)
                                 , NULL                  /* locked */
@@ -1427 +1438 @@
                                 fWrite,                 /* force write access. */
 # endif
-                                &pMemLnx->apPages[0],   /* Page array. */
-                                papVMAs);               /* vmas */
+                                &pMemLnx->apPages[0]    /* Page array. */
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+                                , papVMAs               /* vmas */
+# endif
+                                );
 #endif /* GET_USER_PAGES_API < KERNEL_VERSION(4, 6, 0) */
         if (rc == cPages)
@@ -1453 +1467 @@
 #if RTLNX_VER_MIN(6,3,0)
                 vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);
-#else
+#elif GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
                 papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
 #endif
@@ -1460 +1474 @@
             LNX_MM_UP_READ(pTask->mm);
 
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
             RTMemFree(papVMAs);
+# endif
 
             pMemLnx->Core.u.Lock.R0Process = R0Process;
@@ -1487 +1503 @@
         LNX_MM_UP_READ(pTask->mm);
 
+        rc = VERR_LOCK_FAILED;
+
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
         RTMemFree(papVMAs);
-        rc = VERR_LOCK_FAILED;
-    }
+    }
+# endif
 
     rtR0MemObjDelete(&pMemLnx->Core);