Changeset 86542 in vbox for trunk

Timestamp:

Oct 12, 2020 1:35:53 PM (4 years ago)

Author:

vboxsync

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

140857

Message:

Additions/linux, Runtime/r0drv/linux: Adjustments for Linux 5.9.

Location:

trunk/src/VBox

Files:

• Additions/linux/drm/vbox_drv.c (modified) (2 diffs)
• Additions/linux/drm/vbox_fb.c (modified) (1 diff)
• Additions/linux/drm/vbox_main.c (modified) (3 diffs)
• Additions/linux/drm/vbox_mode.c (modified) (1 diff)
• Additions/linux/drm/vbox_ttm.c (modified) (1 diff)
• Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (1 diff)
• Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)
• Runtime/r0drv/linux/thread2-r0drv-linux.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/vbox_drv.c

@@ -263 +263 @@
 };
 
-static int vbox_master_set(struct drm_device *dev,
+#if RTLNX_VER_MIN(5,9,0)
+static void
+#else
+static int
+#endif
+            vbox_master_set(struct drm_device *dev,
                            struct drm_file *file_priv, bool from_open)
 {
@@ -282 +287 @@
         mutex_unlock(&vbox->hw_mutex);
 
+#if RTLNX_VER_MAX(5,9,0)
         return 0;
+#endif
 }
 

trunk/src/VBox/Additions/linux/drm/vbox_fb.c

@@ -406 +406 @@
                         vbox_bo_unreserve(bo);
                 }
+#if RTLNX_VER_MIN(5,9,0)
+                drm_gem_object_put(afb->obj);
+#else
                 drm_gem_object_put_unlocked(afb->obj);
+#endif
                 afb->obj = NULL;
         }

trunk/src/VBox/Additions/linux/drm/vbox_main.c

@@ -47 +47 @@
 
         if (vbox_fb->obj)
+#if RTLNX_VER_MIN(5,9,0)
+                drm_gem_object_put(vbox_fb->obj);
+#else
                 drm_gem_object_put_unlocked(vbox_fb->obj);
+#endif
 
         drm_framebuffer_cleanup(fb);
@@ -222 +226 @@
         kfree(vbox_fb);
 err_unref_obj:
+#if RTLNX_VER_MIN(5,9,0)
+        drm_gem_object_put(obj);
+#else
         drm_gem_object_put_unlocked(obj);
+#endif
         return ERR_PTR(ret);
 }
@@ -589 +597 @@
 
         ret = drm_gem_handle_create(file, gobj, &handle);
+#if RTLNX_VER_MIN(5,9,0)
+        drm_gem_object_put(gobj);
+#else
         drm_gem_object_put_unlocked(gobj);
+#endif
         if (ret)
                 return ret;

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -885 +885 @@
         vbox_bo_unreserve(bo);
 out_unref_obj:
+#if RTLNX_VER_MIN(5,9,0)
+        drm_gem_object_put(obj);
+#else
         drm_gem_object_put_unlocked(obj);
+#endif
 
         return ret;

trunk/src/VBox/Additions/linux/drm/vbox_ttm.c

@@ -446 +446 @@
 static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
 {
+#if RTLNX_VER_MIN(5,9,0)
+        return bo->bo.mem.start << PAGE_SHIFT;
+#else
         return bo->bo.offset;
+#endif
 }
 

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

@@ -1182 +1182 @@
         else
             rc = get_user_pages_remote(
+# if GET_USER_PAGES_API < KERNEL_VERSION(5, 9, 0)
                                 pTask,                  /* Task for fault accounting. */
+# endif
                                 pTask->mm,              /* Whose pages. */
                                 R3Ptr,                  /* Where from. */

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

@@ -138 +138 @@
 #include <linux/completion.h>
 #include <linux/compiler.h>
-#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */
+/* linux/fs.h defines HAVE_UNLOCKED_IOCTL from 2.6.11 till 5.9, but its meaning remains valid */
+#if RTLNX_VER_MIN(5,9,0)
+# define HAVE_UNLOCKED_IOCTL 1
+#endif
+#if !defined(HAVE_UNLOCKED_IOCTL) && RTLNX_VER_MAX(2,6,38)
 # include <linux/smp_lock.h>
 #endif

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

@@ -55 +55 @@
 DECLHIDDEN(int) rtThreadNativeSetPriority(PRTTHREADINT pThread, RTTHREADTYPE enmType)
 {
-#if RTLNX_VER_MIN(2,6,11)
-    /* See comment near MAX_RT_PRIO in linux/sched.h for details on
-       sched_priority. */
-    int                 iSchedClass = SCHED_NORMAL;
-    struct sched_param  Param       = { .sched_priority = MAX_PRIO - 1 };
+    int                 iSchedClass = SCHED_FIFO;
+    int                 rc = VINF_SUCCESS;
+    struct sched_param  Param = { 0 };
+
+    RT_NOREF_PV(pThread);
+#if RTLNX_VER_MIN(5,9,0)
+    RT_NOREF_PV(iSchedClass);
+    RT_NOREF_PV(Param);
+#endif
     switch (enmType)
     {
-        case RTTHREADTYPE_INFREQUENT_POLLER:
-            Param.sched_priority = MAX_RT_PRIO + 5;
+        case RTTHREADTYPE_IO:
+#if RTLNX_VER_MAX(5,9,0)
+            /* Set max. priority to preempt all other threads on this CPU. */
+            Param.sched_priority = MAX_RT_PRIO - 1;
+#else 
+            /* Effectively changes prio to 50 */
+            sched_set_fifo(current);
+#endif
             break;
-
-        case RTTHREADTYPE_EMULATION:
-            Param.sched_priority = MAX_RT_PRIO + 4;
+        case RTTHREADTYPE_TIMER:
+#if RTLNX_VER_MAX(5,9,0)
+            Param.sched_priority = 1; /* not 0 just in case */
+#else
+            /* Just one above SCHED_NORMAL class */
+            sched_set_fifo_low(current);
+#endif
             break;
-
-        case RTTHREADTYPE_DEFAULT:
-            Param.sched_priority = MAX_RT_PRIO + 3;
-            break;
-
-        case RTTHREADTYPE_MSG_PUMP:
-            Param.sched_priority = MAX_RT_PRIO + 2;
-            break;
-
-        case RTTHREADTYPE_IO:
-            iSchedClass = SCHED_FIFO;
-            Param.sched_priority = MAX_RT_PRIO - 1;
-            break;
-
-        case RTTHREADTYPE_TIMER:
-            iSchedClass = SCHED_FIFO;
-            Param.sched_priority = 1; /* not 0 just in case */
-            break;
-
         default:
-            AssertMsgFailed(("enmType=%d\n", enmType));
-            return VERR_INVALID_PARAMETER;
+            /* pretend success instead of VERR_NOT_SUPPORTED */
+            return rc;
     }
-
-    sched_setscheduler(current, iSchedClass, &Param);
-#else
-    RT_NOREF_PV(enmType);
+#if RTLNX_VER_MAX(5,9,0)
+    if ((sched_setscheduler(current, iSchedClass, &Param)) != 0) {
+        rc = VERR_GENERAL_FAILURE;
+    }
 #endif
-    RT_NOREF_PV(pThread);
-
-    return VINF_SUCCESS;
+    return rc;
 }