Support kernel 4.17+ with new mm interface

Author: kostorr

patches/linux_uio/uio_pci_dma.c

@@ -1068,25 +1068,45 @@ uio_pci_dma_free_kernel_memory(struct uio_pci_dma_private *priv)
 
 
 #ifdef UIO_PDA_USE_PAGEFAULT_HANDLER
+#ifdef PDA_VMF_T
+static vm_fault_t
+#else
 static int
+#endif
 page_fault_handler
 (
+#ifndef PDA_VMF_T
     struct vm_area_struct *vma,
+#endif
     struct vm_fault       *vmf
 )
 {
     UIO_DEBUG_ENTER();
 
+#ifdef PDA_VMF_T
+    struct vm_area_struct *vma = vmf->vma;
+#endif
     struct uio_pci_dma_private *priv = vma->vm_private_data;
 
 #ifdef PDA_PFN_T_PAGES
+#ifdef PDA_VMF_T
+    return vmf_insert_mixed(vma, (unsigned long)vmf->address,
+                              pfn_to_pfn_t(priv->pfn_list[vmf->pgoff % priv->pages]));
+#else
     int ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
                               pfn_to_pfn_t(priv->pfn_list[vmf->pgoff % priv->pages]));
+#endif
+#else
+#ifdef PDA_VMF_T
+    return vmf_insert_mixed(vma, (unsigned long)vmf->address,
+                              priv->pfn_list[vmf->pgoff % priv->pages]);
 #else
     int ret = vm_insert_mixed(vma, (unsigned long)vmf->virtual_address,
                               priv->pfn_list[vmf->pgoff % priv->pages]);
 #endif
+#endif
 
+#ifndef PDA_VMF_T
     switch(ret)
     {
         case 0:
@@ -1095,6 +1115,7 @@ page_fault_handler
         case -ENOMEM      : { UIO_DEBUG_RETURN(VM_FAULT_OOM);    }
         default           : { UIO_DEBUG_RETURN(VM_FAULT_SIGBUS); }
     }
+#endif
 
 }
 

patches/linux_uio/uio_pci_dma.h

@@ -327,6 +327,16 @@ BIN_ATTR_MAP_CALLBACK( map_sg );
 #define PDA_SIXARG_GUP
 #endif
 
+/**
+ * Kernel 4.17 joins struct fault_env and vm_fault:
+ * https://github.com/torvalds/linux/commit/82b0f8c39a3869b6fd2a10e180a862248736ec6f
+ * It also introduces vmf_insert_page() of vm_fault_t return type, replacing vm_insert_page()
+ * https://github.com/torvalds/linux/commit/1c8f422059ae5da07db7406ab916203f9417e396
+ **/
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
+#define PDA_VMF_T
+#endif
+
 #endif /** __KERNEL__ */
 
 #endif /** UIO_PCI_DMA_H */