- fix build on ix86

[packages/xorg-driver-video-nvidia-legacy-390xx.git] / kernel-6.5-handle-get_user_pages-vmas-argument-remova.patch

From a8b9fa3504163bfe29fc9faa2aac201ace66e4da Mon Sep 17 00:00:00 2001
From: Paolo Pisati <paolo.pisati@canonical.com>
Date: Thu, 13 Jul 2023 13:35:33 +0000
Subject: [PATCH 2/2] Linux 6.5: handle get_user_pages() vmas argument removal

commit b2cac248191b7466c5819e0da617b0705a26e197 "mm/gup: removed vmas
array from internal GUP functions" removed vmas arg from
__get_user_pages_locked()[*], and to handle that we do two things:

1) when caller vmas arg was NULL, blindly substitute the call with the new API.

2) when caller vmas was a real array (and the caller expected it to be
   populated upon return), reimplement the internal "for(;;) vma = vma_find(); vmas[i] = vma;"
   loop that was partially removed.

*: get_user_pages() is a wrapper around __get_user_pages_locked()

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 common/inc/nv-mm.h | 56 +++++++++++++------
 conftest.sh        | 26 ++++++++-
 nvidia-drm/nvidia-drm-linux.c             |  5 ++
 nvidia-uvm/uvm8_tools.c    | 24 ++++++++
 nvidia/kernel/os-mlock.c  |  5 ++
 5 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h
index 51d0df4a..86bf6036 100644
--- a/kernel/common/inc/nv-mm.h
+++ b/kernel/common/inc/nv-mm.h
@@ -77,24 +77,44 @@ typedef int vm_fault_t;
     #if defined(NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS)
         #define NV_GET_USER_PAGES get_user_pages
     #else
-        #include <linux/mm.h>
-
-        static inline long NV_GET_USER_PAGES(unsigned long start,
-                                             unsigned long nr_pages,
-                                             int write,
-                                             int force,
-                                             struct page **pages,
-                                             struct vm_area_struct **vmas)
-        {
-            unsigned int flags = 0;
-
-            if (write)
-                flags |= FOLL_WRITE;
-            if (force)
-                flags |= FOLL_FORCE;
-
-            return get_user_pages(start, nr_pages, flags, pages, vmas);
-        }
+	#if defined(NV_GET_USER_PAGES_DROPPED_VMA)
+            #include <linux/mm.h>
+
+            static inline long NV_GET_USER_PAGES(unsigned long start,
+                                                 unsigned long nr_pages,
+                                                 int write,
+                                                 int force,
+                                                 struct page **pages)
+            {
+                unsigned int flags = 0;
+
+                if (write)
+                    flags |= FOLL_WRITE;
+                if (force)
+                    flags |= FOLL_FORCE;
+
+                return get_user_pages(start, nr_pages, flags, pages);
+            }
+	#else
+            #include <linux/mm.h>
+
+            static inline long NV_GET_USER_PAGES(unsigned long start,
+                                                 unsigned long nr_pages,
+                                                 int write,
+                                                 int force,
+                                                 struct page **pages,
+                                                 struct vm_area_struct **vmas)
+            {
+                unsigned int flags = 0;
+
+                if (write)
+                    flags |= FOLL_WRITE;
+                if (force)
+                    flags |= FOLL_FORCE;
+
+                return get_user_pages(start, nr_pages, flags, pages, vmas);
+            }
+	#endif
     #endif
 #endif
 
diff --git a/kernel/conftest.sh b/kernel/conftest.sh
index abe435ff..0131fab5 100755
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -3051,7 +3051,6 @@ compile_test() {
             # write and force parameters AND that gup has task_struct and
             # mm_struct as its first arguments.
             # Return if available.
-            # Fall through to default case if absent.
 
             echo "$CONFTEST_PREAMBLE
             #include <linux/mm.h>
@@ -3075,6 +3074,31 @@ compile_test() {
                 return
             fi
 
+            # Conftest #4: check if vma arg was dropped
+            # Return if available.
+            # Fall through to default case if absent.
+
+            echo "$CONFTEST_PREAMBLE
+            #include <linux/mm.h>
+            long get_user_pages(unsigned long start,
+                                unsigned long nr_pages,
+                                unsigned int gup_flags,
+                                struct page **pages) {
+                return 0;
+            }" > conftest$$.c
+
+            $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+            rm -f conftest$$.c
+
+            if [ -f conftest$$.o ]; then
+                echo "#define NV_GET_USER_PAGES_DROPPED_VMA" | append_conftest "functions"
+                echo "#undef NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions"
+                echo "#undef NV_GET_USER_PAGES_HAS_TASK_STRUCT" | append_conftest "functions"
+                 rm -f conftest$$.o
+                return
+            fi
+
+
             echo "#define NV_GET_USER_PAGES_HAS_WRITE_AND_FORCE_ARGS" | append_conftest "functions"
             echo "#define NV_GET_USER_PAGES_HAS_TASK_STRUCT" | append_conftest "functions"
 
diff --git a/kernel/nvidia-drm/nvidia-drm-linux.c b/kernel/nvidia-drm/nvidia-drm-linux.c
index be405f29..dd4a2a6d 100644
--- a/kernel/nvidia-drm/nvidia-drm-linux.c
+++ b/kernel/nvidia-drm/nvidia-drm-linux.c
@@ -115,8 +115,13 @@ int nv_drm_lock_user_pages(unsigned long address,
 
     nv_mmap_read_lock(mm);
 
+#if defined(NV_GET_USER_PAGES_DROPPED_VMA)
+    pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
+		                     user_pages);
+#else
     pages_pinned = NV_GET_USER_PAGES(address, pages_count, write, force,
                                      user_pages, NULL);
+#endif
     nv_mmap_read_unlock(mm);
 
     if (pages_pinned < 0 || (unsigned)pages_pinned < pages_count) {
diff --git a/kernel/nvidia/os-mlock.c b/kernel/nvidia/os-mlock.c
index f88daed4..ad5cb9a1 100644
--- a/kernel/nvidia/os-mlock.c
+++ b/kernel/nvidia/kernel/os-mlock.c
@@ -127,8 +127,13 @@ NV_STATUS NV_API_CALL os_lock_user_pages(
     }
 
     nv_mmap_read_lock(mm);
+#if defined(NV_GET_USER_PAGES_DROPPED_VMA)
+    ret = NV_GET_USER_PAGES((unsigned long)address,
+                            page_count, write, force, user_pages);
+#else
     ret = NV_GET_USER_PAGES((unsigned long)address,
                             page_count, write, force, user_pages, NULL);
+#endif
     nv_mmap_read_unlock(mm);
     pinned = ret;
 
-- 
2.40.1