[nvidia-304xx-kmod] patch for kernel-4.6

commit 646e9c74c5d4fbeb2c95a404d78978ae053d2612 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Jul 1 10:30:53 2016 +0100 patch for kernel-4.6 disable-mtrr.patch | 2 +- linux-4.6.patch | 146 +++++++++++++++++++++++++++++++++++++++++++++++++ nvidia-304xx-kmod.spec | 7 ++- 3 files changed, 153 insertions(+), 2 deletions(-) --- diff --git a/disable-mtrr.patch b/disable-mtrr.patch index c0cf224..045f394 100644 --- a/disable-mtrr.patch +++ b/disable-mtrr.patch @@ -6,7 +6,7 @@ Description: Disable MTRR on kernel >= 4.3 until upstream fixes it. --- kernel/nv-linux.h.orig +++ kernel/nv-linux.h -@@ -256,6 +256,15 @@ +@@ -254,6 +254,15 @@ #include <linux/seq_file.h> #endif diff --git a/linux-4.6.patch b/linux-4.6.patch new file mode 100644 index 0000000..3f25847 --- /dev/null +++ b/linux-4.6.patch @@ -0,0 +1,146 @@ +--- /dev/null ++++ b/kernel/nv-mm.h +@@ -0,0 +1,55 @@ ++/******************************************************************************* ++ Copyright (c) 2016 NVIDIA Corporation ++ ++ Permission is hereby granted, free of charge, to any person obtaining a copy ++ of this software and associated documentation files (the "Software"), to ++ deal in the Software without restriction, including without limitation the ++ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++ sell copies of the Software, and to permit persons to whom the Software is ++ furnished to do so, subject to the following conditions: ++ ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ DEALINGS IN THE SOFTWARE. ++ ++*******************************************************************************/ ++#ifndef __NV_MM_H__ ++#define __NV_MM_H__ ++ ++/* get_user_pages_remote() was added by: ++ * 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7 ++ * ++ * The very next commit (cde70140fed8429acf7a14e2e2cbd3e329036653) ++ * deprecated the 8-argument version of get_user_pages for the ++ * non-remote case (calling get_user_pages with current and current->mm). ++ * ++ * The guidelines are: call NV_GET_USER_PAGES_REMOTE if you need the 8-argument ++ * version that uses something other than current and current->mm. Use ++ * NV_GET_USER_PAGES if you are refering to current and current->mm. ++ * ++* Note that get_user_pages_remote() requires the caller to hold a reference on ++* the task_struct (if non-NULL) and the mm_struct. This will always be true ++* when using current and current->mm. If the kernel passes the driver a vma ++* via driver callback, the kernel holds a reference on vma->vm_mm over that ++* callback. ++ */ ++ ++#if defined(NV_GET_USER_PAGES_REMOTE_PRESENT) ++ #define NV_GET_USER_PAGES get_user_pages ++ #define NV_GET_USER_PAGES_REMOTE get_user_pages_remote ++#else ++ #define NV_GET_USER_PAGES(start, nr_pages, write, force, pages, vmas) \ ++ get_user_pages(current, current->mm, start, nr_pages, write, force, pages, vmas) ++ ++ #define NV_GET_USER_PAGES_REMOTE get_user_pages ++#endif ++ ++ ++#endif // __NV_MM_H__ +--- a/kernel/nv-mlock.c ++++ b/kernel/nv-mlock.c +@@ -13,6 +13,7 @@ + + #include "os-interface.h" + #include "nv-linux.h" ++#include "nv-mm.h" + + RM_STATUS NV_API_CALL nv_lock_user_pages( + nv_state_t *nv, +@@ -49,7 +50,7 @@ + } + + down_read(&mm->mmap_sem); +- ret = get_user_pages(current, mm, (unsigned long)address, ++ ret = NV_GET_USER_PAGES((unsigned long)address, + page_count, write, force, user_pages, NULL); + up_read(&mm->mmap_sem); + pinned = ret; +@@ -62,7 +63,7 @@ + else if (pinned < page_count) + { + for (i = 0; i < pinned; i++) +- page_cache_release(user_pages[i]); ++ put_page(user_pages[i]); + os_free_mem(user_pages); + return RM_ERR_INVALID_ADDRESS; + } +@@ -80,7 +81,7 @@ + { + pci_unmap_page(dev, pte_array[j], + PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); +- page_cache_release(user_pages[j]); ++ put_page(user_pages[j]); + } + os_free_mem(user_pages); + return RM_ERR_OPERATING_SYSTEM; +@@ -114,7 +115,7 @@ + PAGE_SIZE, PCI_DMA_BIDIRECTIONAL); + if (write) + set_page_dirty_lock(user_pages[i]); +- page_cache_release(user_pages[i]); ++ put_page(user_pages[i]); + } + + os_free_mem(user_pages); + +diff --git a/kernel/conftest.sh.orig b/kernel/conftest.sh +index d01488b..308ea8a 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -1525,6 +1525,23 @@ compile_test() { + + compile_check_conftest "$CODE" "NV_NODE_END_PFN_PRESENT" "" "functions" + ;; ++ ++ get_user_pages_remote) ++ # ++ # Determine if the function get_user_pages_remote() is ++ # present. ++ # ++ # get_user_pages_remote() was added by: ++ # 2016 Feb 12: 1e9877902dc7e11d2be038371c6fbf2dfcd469d7 ++ # ++ CODE=" ++ #include <linux/mm.h> ++ int conftest_get_user_pages_remote(void) { ++ get_user_pages_remote(); ++ }" ++ ++ compile_check_conftest "$CODE" "NV_GET_USER_PAGES_REMOTE_PRESENT" "" "functions" ++ ;; + esac + } + +--- a/kernel/Makefile.kbuild ++++ b/kernel/Makefile.kbuild +@@ -187,7 +187,8 @@ + drm_pci_set_busid \ + write_cr4 \ + for_each_online_node \ +- node_end_pfn ++ node_end_pfn \ ++ get_user_pages_remote + + # + # Miscellaneous NVIDIA kernel module build support targets. They are needed + diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec index 17bcada..b637010 100644 --- a/nvidia-304xx-kmod.spec +++ b/nvidia-304xx-kmod.spec @@ -8,7 +8,7 @@ Name: nvidia-304xx-kmod Version: 304.131 # Taken over by kmodtool -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -21,6 +21,7 @@ Source0: nvidia-kmod-data-%{version}.tar.xz Source11: nvidia-304xx-kmodtool-excludekernel-filterfile # https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-dri... Patch0: disable-mtrr.patch +Patch1: linux-4.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +49,7 @@ for arch in x86 x64 do pushd nvidiapkg-${arch} %patch0 -p0 +%patch1 -p1 popd done @@ -81,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 01 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 304.131-3 +- patch for kernel-4.6 + * Mon Feb 15 2016 Orion Poplawski <orion(a)cora.nwra.com&gt; - 304.131-2 - Add patch for 4.3 kernel