Bug#928634: nvidia-legacy-390xx-kernel-source: Fails to build with kernel 5.1

[Kevin Locke]

Here is an additional patch with backports from 430.14 to build with
kernel 5.2.  Again tested by me on amd64 but not arm or i386.

Cheers,
Kevin
Author: Kevin Locke 
Description: backport changes from 430.14 for kernel 5.2

Note: addition of set_page_dirty backported due to fc1d8e7cca2d

--- a/nvidia-uvm/uvm8_tools.c
+++ b/nvidia-uvm/uvm8_tools.c
@@ -204,18 +204,21 @@
 return event_tracker != NULL && !event_tracker->is_queue;
 }
 
-static void put_user_pages(struct page **pages, NvU64 page_count)
+static void uvm_put_user_pages_dirty(struct page **pages, NvU64 page_count)
 {
 NvU64 i;
-for (i = 0; i < page_count; i++)
+
+for (i = 0; i < page_count; i++) {
+set_page_dirty(pages[i]);
 put_page(pages[i]);
+}
 }
 
 static void unmap_user_pages(struct page **pages, void *addr, NvU64 size)
 {
 size = DIV_ROUND_UP(size, PAGE_SIZE);
 vunmap((NvU8 *)addr);
-put_user_pages(pages, size);
+uvm_put_user_pages_dirty(pages, size);
 uvm_kvfree(pages);
 }
 
@@ -279,7 +282,7 @@
 uvm_kvfree(vmas);
 
 if (ret > 0)
-put_user_pages(*pages, ret);
+uvm_put_user_pages_dirty(*pages, ret);
 else if (ret < 0)
 status = errno_to_nv_status(ret);
 

Bug#928634: nvidia-legacy-390xx-kernel-source: Fails to build with kernel 5.1

[Harald Dunkel]

No problems by now. Currently I am using version 5.1.7, built from upstream's
sources.

Kernel 5.0 has reached EOL.


Regards
Harri

Bug#928634: nvidia-legacy-390xx-kernel-source: Fails to build with kernel 5.1

[Harald Dunkel]

I tried it (using sid and upstream's kernel 5.1.6): Builds fine,
X appears to work.


Regards
Harri

Bug#928634: nvidia-legacy-390xx-kernel-source: Fails to build with kernel 5.1

[Kevin Locke]

Package: nvidia-legacy-390xx-kernel-source
Version: 390.116-1
Severity: normal
Tags: patch

Dear Maintainer,

nvidia-legacy-390xx-kernel fails to build with Linux 5.1 due to errors
such as the following:

/usr/src/modass/usr_src/modules/nvidia-legacy-390xx-kernel/common/inc/nv-list-helpers.h:94:19:
 error: redefinition of ‘list_is_first’
 static inline int list_is_first(const struct list_head *list,
   ^
In file included from ./include/linux/preempt.h:11,
 from ./include/linux/spinlock.h:51,
 from 
/usr/src/modass/usr_src/modules/nvidia-legacy-390xx-kernel/common/inc/nv-lock.h:16,
 from 
/usr/src/modass/usr_src/modules/nvidia-legacy-390xx-kernel/common/inc/nv-linux.h:19,
 from 
/usr/src/modass/usr_src/modules/nvidia-legacy-390xx-kernel/nvidia/nv-frontend.c:13:
./include/linux/list.h:214:19: note: previous definition of ‘list_is_first’ was 
here
 static inline int list_is_first(const struct list_head *list,
   ^

Presumably this will be fixed by the next release in the 390 series.
Until then, I have attached a patch with the minimal necessary changes
backported from 418.74.  I compiled and tested (by running some
graphics-intensive workloads) the module on an amd64 system, but have
not tested on arm or i386.

Best,
Kevin


-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (101, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.1.0 (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8), 
LANGUAGE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages nvidia-legacy-390xx-kernel-source depends on:
pn  debhelper-compat  
ii  make  4.2.1-1.2
ii  quilt 0.65-3
ii  xz-utils  5.2.4-1

Versions of packages nvidia-legacy-390xx-kernel-source recommends:
ii  module-assistant0.11.10
ii  nvidia-legacy-390xx-kernel-support  390.116-1

Versions of packages nvidia-legacy-390xx-kernel-source suggests:
ii  nvidia-legacy-390xx-driver  390.116-1

Versions of packages nvidia-legacy-390xx-driver depends on:
ii  nvidia-installer-cleanup 20151021+9
ii  nvidia-legacy-390xx-alternative  390.116-1
ii  nvidia-legacy-390xx-driver-bin   390.116-1
ii  nvidia-legacy-390xx-driver-libs  390.116-1
ii  nvidia-legacy-390xx-kernel-5.0.8 [nvidia-legacy-390xx-k  390.116-1+5.0.8-9
ii  nvidia-legacy-390xx-kernel-5.1.0 [nvidia-legacy-390xx-k  390.116-1+5.1.0-11
ii  nvidia-legacy-390xx-vdpau-driver 390.116-1
ii  nvidia-support   20151021+9
ii  xserver-xorg-video-nvidia-legacy-390xx   390.116-1

Versions of packages nvidia-legacy-390xx-driver recommends:
ii  libnvidia-legacy-390xx-cfg1   390.116-1
pn  nvidia-persistenced   
ii  nvidia-settings-legacy-390xx  390.116-1

nvidia-legacy-390xx-driver suggests no packages.

Versions of packages nvidia-legacy-390xx-driver-libs:amd64 depends on:
ii  libgl1-nvidia-legacy-390xx-glvnd-glx  390.116-1
ii  nvidia-legacy-390xx-egl-icd   390.116-1

Versions of packages nvidia-legacy-390xx-driver-libs:amd64 recommends:
ii  libgles-nvidia-legacy-390xx1  390.116-1
ii  libgles-nvidia-legacy-390xx2  390.116-1
ii  libglx-nvidia-legacy-390xx0   390.116-1
ii  libnvidia-legacy-390xx-cfg1   390.116-1
ii  libopengl01.1.0-1
pn  nvidia-legacy-390xx-driver-libs-i386  
ii  nvidia-legacy-390xx-vulkan-icd390.116-1

Versions of packages xserver-xorg-video-nvidia-legacy-390xx depends on:
ii  libc6  2.28-10
ii  libnvidia-legacy-390xx-glcore  390.116-1
ii  nvidia-installer-cleanup   20151021+9
ii  nvidia-legacy-390xx-alternative390.116-1
ii  nvidia-support 20151021+9
ii  xserver-xorg-core [xorg-video-abi-24]  2:1.20.3-1

Versions of packages xserver-xorg-video-nvidia-legacy-390xx recommends:
ii  nvidia-legacy-390xx-driver   390.116-1
ii  nvidia-legacy-390xx-kernel-5.0.8 [nvidia-legacy-390xx-k  390.116-1+5.0.8-9
ii  nvidia-legacy-390xx-kernel-5.1.0 [nvidia-legacy-390xx-k  390.116-1+5.1.0-11
ii  nvidia-legacy-390xx-vdpau-driver 390.116-1
ii  nvidia-settings-legacy-390xx 390.116-1

xserver-xorg-video-nvidia-legacy-390xx suggests no packages.

Versions of packages nvidia-legacy-390xx-alternative depends on:
ii  dpkg1.19.6
ii  glx-alternative-nvidia  1.0.0

Versions of packages glx-alternative-nvidia depends on:
ii  dpkg  1.19.6
ii