570.123.11

Author: russellcnv

README.md

@@ -1,7 +1,7 @@
 # NVIDIA Linux Open GPU Kernel Module Source
 
 This is the source release of the NVIDIA Linux open GPU kernel modules,
-version 570.123.10.
+version 570.123.11.
 
 
 ## How to Build
@@ -17,7 +17,7 @@ as root:
 
 Note that the kernel modules built here must be used with GSP
 firmware and user-space NVIDIA GPU driver components from a corresponding
-570.123.10 driver release.  This can be achieved by installing
+570.123.11 driver release.  This can be achieved by installing
 the NVIDIA GPU driver from the .run file using the `--no-kernel-modules`
 option.  E.g.,
 
@@ -185,7 +185,7 @@ table below).
 For details on feature support and limitations, see the NVIDIA GPU driver
 end user README here:
 
-https://us.download.nvidia.com/XFree86/Linux-x86_64/570.123.10/README/kernel_open.html
+https://us.download.nvidia.com/XFree86/Linux-x86_64/570.123.11/README/kernel_open.html
 
 For vGPU support, please refer to the README.vgpu packaged in the vGPU Host
 Package for more details.

kernel-open/Kbuild

@@ -86,7 +86,7 @@ EXTRA_CFLAGS += -I$(src)/common/inc
 EXTRA_CFLAGS += -I$(src)
 EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args
 EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM
-EXTRA_CFLAGS += -DNV_VERSION_STRING=\"570.123.10\"
+EXTRA_CFLAGS += -DNV_VERSION_STRING=\"570.123.11\"
 
 ifneq ($(SYSSRCHOST1X),)
  EXTRA_CFLAGS += -I$(SYSSRCHOST1X)

kernel-open/common/inc/nv-linux.h

@@ -345,8 +345,6 @@ extern int nv_pat_mode;
 
 #define NV_PAGE_COUNT(page) \
   ((unsigned int)page_count(page))
-#define NV_GET_PAGE_COUNT(page_ptr) \
-  (NV_PAGE_COUNT(NV_GET_PAGE_STRUCT(page_ptr->phys_addr)))
 #define NV_GET_PAGE_FLAGS(page_ptr) \
   (NV_GET_PAGE_STRUCT(page_ptr->phys_addr)->flags)
 
@@ -1161,10 +1159,6 @@ typedef struct nvidia_pte_s {
     NvU64           phys_addr;
     unsigned long   virt_addr;
     NvU64           dma_addr;
-#ifdef CONFIG_XEN
-    unsigned int    guest_pfn;
-#endif
-    unsigned int    page_count;
 } nvidia_pte_t;
 
 #if defined(CONFIG_DMA_SHARED_BUFFER)

kernel-open/conftest.sh

@@ -7604,6 +7604,33 @@ compile_test() {
             compile_check_conftest "$CODE" "NV_DRM_DRIVER_HAS_DATE" "" "types"
         ;;
 
+        drm_connector_helper_funcs_mode_valid_has_const_mode_arg)
+            #
+            # Determine if the 'mode' pointer argument is const in
+            # drm_connector_helper_funcs::mode_valid.
+            #
+            # The 'mode' pointer argument in
+            # drm_connector_helper_funcs::mode_valid was made const by commit
+            # 26d6fd81916e ("drm/connector: make mode_valid take a const struct
+            # drm_display_mode") in linux-next, expected in v6.15.
+            #
+            CODE="
+            #if defined(NV_DRM_DRM_ATOMIC_HELPER_H_PRESENT)
+            #include <drm/drm_atomic_helper.h>
+            #endif
+
+            static int conftest_drm_connector_mode_valid(struct drm_connector *connector,
+                                                         const struct drm_display_mode *mode) {
+                return 0;
+            }
+
+            const struct drm_connector_helper_funcs conftest_drm_connector_helper_funcs = {
+                .mode_valid = conftest_drm_connector_mode_valid,
+            };"
+
+            compile_check_conftest "$CODE" "NV_DRM_CONNECTOR_HELPER_FUNCS_MODE_VALID_HAS_CONST_MODE_ARG" "" "types"
+        ;;
+
         # When adding a new conftest entry, please use the correct format for
         # specifying the relevant upstream Linux kernel commit.  Please
         # avoid specifying -rc kernels, and only use SHAs that actually exist

kernel-open/nvidia-drm/nvidia-drm-connector.c

@@ -314,7 +314,11 @@ static int nv_drm_connector_get_modes(struct drm_connector *connector)
 }
 
 static int nv_drm_connector_mode_valid(struct drm_connector    *connector,
+#if defined(NV_DRM_CONNECTOR_HELPER_FUNCS_MODE_VALID_HAS_CONST_MODE_ARG)
+                                       const struct drm_display_mode *mode)
+#else
                                        struct drm_display_mode *mode)
+#endif
 {
     struct drm_device *dev = connector->dev;
     struct nv_drm_device *nv_dev = to_nv_device(dev);

kernel-open/nvidia-drm/nvidia-drm-sources.mk

@@ -145,3 +145,4 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_gem_prime_mmap
 NV_CONFTEST_TYPE_COMPILE_TESTS += drm_output_poll_changed
 NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_date
 NV_CONFTEST_TYPE_COMPILE_TESTS += file_operations_fop_unsigned_offset_present
+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_connector_helper_funcs_mode_valid_has_const_mode_arg

kernel-open/nvidia-uvm/uvm_conf_computing.c

@@ -708,7 +708,12 @@ void uvm_conf_computing_disable_key_rotation(uvm_gpu_t *gpu)
 
 bool uvm_conf_computing_is_key_rotation_enabled(uvm_gpu_t *gpu)
 {
-    return gpu->channel_manager->conf_computing.key_rotation_enabled;
+    UVM_ASSERT(gpu);
+
+    // If the channel_manager is not set, we're in channel manager destroy
+    // path after the pointer was NULL-ed. Chances are that other key rotation
+    // infrastructure is not available either. Disallow the key rotation.
+    return gpu->channel_manager && gpu->channel_manager->conf_computing.key_rotation_enabled;
 }
 
 bool uvm_conf_computing_is_key_rotation_enabled_in_pool(uvm_channel_pool_t *pool)

kernel-open/nvidia-uvm/uvm_linux.h

@@ -183,7 +183,7 @@ static inline const struct cpumask *uvm_cpumask_of_node(int node)
             printk(fmt, ##__VA_ARGS__); \
     } while (0)
 
-#define NV_UVM_GFP_FLAGS (GFP_KERNEL)
+#define NV_UVM_GFP_FLAGS (GFP_KERNEL | __GFP_NOMEMALLOC)
 
 #if defined(NVCPU_X86)
 /* Some old IA32 kernels don't have 64/64 division routines,

kernel-open/nvidia-uvm/uvm_va_block.c

@@ -1569,7 +1569,7 @@ static NV_STATUS block_alloc_cpu_chunk(uvm_va_block_t *block,
         if (status == NV_OK)
             break;
 
-        if (flags & UVM_CPU_CHUNK_ALLOC_FLAGS_STRICT) {
+        if ((flags & UVM_CPU_CHUNK_ALLOC_FLAGS_STRICT) && (num_possible_nodes() > 1)) {
             flags &= ~UVM_CPU_CHUNK_ALLOC_FLAGS_STRICT;
             numa_fallback = true;
             status = uvm_cpu_chunk_alloc(alloc_size, flags, NUMA_NO_NODE, chunk);

kernel-open/nvidia/nv-vm.c

@@ -431,7 +431,6 @@ NV_STATUS nv_alloc_contig_pages(
 
         page_ptr = at->page_table[i];
         page_ptr->phys_addr = phys_addr;
-        page_ptr->page_count = NV_GET_PAGE_COUNT(page_ptr);
         page_ptr->virt_addr = virt_addr;
         page_ptr->dma_addr = nv_phys_to_dma(dev, page_ptr->phys_addr);
 
@@ -486,17 +485,6 @@ void nv_free_contig_pages(
     {
         page_ptr = at->page_table[i];
 
-        if (NV_GET_PAGE_COUNT(page_ptr) != page_ptr->page_count)
-        {
-            static int count = 0;
-            if (count++ < NV_MAX_RECURRING_WARNING_MESSAGES)
-            {
-                nv_printf(NV_DBG_ERRORS,
-                    "NVRM: VM: %s: page count != initial page count (%u,%u)\n",
-                    __FUNCTION__, NV_GET_PAGE_COUNT(page_ptr),
-                    page_ptr->page_count);
-            }
-        }
         NV_MAYBE_UNRESERVE_PAGE(page_ptr);
     }
 
@@ -600,7 +588,6 @@ NV_STATUS nv_alloc_system_pages(
 
             page_ptr = at->page_table[(i * os_pages_in_page) + sub_page_idx];
             page_ptr->phys_addr = phys_addr;
-            page_ptr->page_count = NV_GET_PAGE_COUNT(page_ptr);
             page_ptr->virt_addr = sub_page_virt_addr;
 
             //
@@ -667,18 +654,6 @@ void nv_free_system_pages(
     {
         page_ptr = at->page_table[i];
 
-        if (NV_GET_PAGE_COUNT(page_ptr) != page_ptr->page_count)
-        {
-            static int count = 0;
-            if (count++ < NV_MAX_RECURRING_WARNING_MESSAGES)
-            {
-                nv_printf(NV_DBG_ERRORS,
-                    "NVRM: VM: %s: page count != initial page count (%u,%u)\n",
-                    __FUNCTION__, NV_GET_PAGE_COUNT(page_ptr),
-                    page_ptr->page_count);
-            }
-        }
-
         NV_MAYBE_UNRESERVE_PAGE(page_ptr);
     }