backport chnages to support Alma Linux 9.6

nindanaoto · nindanaoto · commit ac0a756484fd · 2025-08-22T12:08:18.000+09:00
Signed-off-by: nindanaoto &lt;matsuoka.kotaro@gmail.com&gt;
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/mgmtpf/mgmt-core.c b/src/runtime_src/core/pcie/driver/linux/xocl/mgmtpf/mgmt-core.c
@@ -315,13 +315,13 @@ static int bridge_mmap(struct file *file, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
@@ -1760,7 +1760,7 @@ static int __init xclmgmt_init(void)
 
 	pr_info(DRV_NAME " init()\n");
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) && !defined(RHEL_9_4_GE)
 	xrt_class = class_create(THIS_MODULE, "xrt_mgmt");
 #else
 	xrt_class = class_create("xrt_mgmt");
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/accel_deadlock_detector.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/accel_deadlock_detector.c
@@ -226,13 +226,13 @@ static int accel_deadlock_detector_mmap(struct file *filp, struct vm_area_struct
 
     // prevent touching the pages (byte access) for swap-in, and prevent the pages from being swapped out
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
     vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
     vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
     vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
     vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/aim.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/aim.c
@@ -413,13 +413,13 @@ static int aim_mmap(struct file *filp, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/am.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/am.c
@@ -405,13 +405,13 @@ static int am_mmap(struct file *filp, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/asm.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/asm.c
@@ -339,13 +339,13 @@ static int asm_mmap(struct file *filp, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/lapc.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/lapc.c
@@ -244,13 +244,13 @@ static int lapc_mmap(struct file *filp, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/msix_xdma.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/msix_xdma.c
@@ -90,7 +90,11 @@ static irqreturn_t msix_xdma_isr(int irq, void *arg)
 		ret = irq_entry->handler(irq, irq_entry->arg);
 
 	if (!IS_ERR_OR_NULL(irq_entry->event_ctx)) {
+#if KERNEL_VERSION(6, 8, 0) <= LINUX_VERSION_CODE || defined(RHEL_9_5_GE)
+		eventfd_signal(irq_entry->event_ctx);
+#else
 		eventfd_signal(irq_entry->event_ctx, 1);
+#endif
 	}
 
 	return ret;
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/spc.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/spc.c
@@ -225,13 +225,13 @@ static int spc_mmap(struct file *filp, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_fifo_lite.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_fifo_lite.c
@@ -209,13 +209,13 @@ static int trace_fifo_lite_mmap(struct file *filp, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_funnel.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_funnel.c
@@ -212,13 +212,13 @@ static int trace_funnel_mmap(struct file *filp, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_s2mm.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/trace_s2mm.c
@@ -274,13 +274,13 @@ static int trace_s2mm_mmap(struct file *filp, struct vm_area_struct *vma)
 	 * and prevent the pages from being swapped out
 	 */
 #ifndef VM_RESERVED
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP;
 #else
 	vm_flags_set(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP);
 #endif
 #else
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO | VM_RESERVED;
 #else
 	vm_flags_set(vma, VM_IO | VM_RESERVED);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/subdev/xdma.c b/src/runtime_src/core/pcie/driver/linux/xocl/subdev/xdma.c
@@ -294,7 +294,11 @@ static irqreturn_t xdma_isr(int irq, void *arg)
 		ret = irq_entry->handler(irq, irq_entry->arg);
 
 	if (!IS_ERR_OR_NULL(irq_entry->event_ctx)) {
+#if KERNEL_VERSION(6, 8, 0) <= LINUX_VERSION_CODE || defined(RHEL_9_5_GE)
+		eventfd_signal(irq_entry->event_ctx);
+#else
 		eventfd_signal(irq_entry->event_ctx, 1);
+#endif
 	}
 
 	return ret;
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_bo.c
@@ -1387,7 +1387,7 @@ int xocl_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
 
 	vma->vm_private_data = obj;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_MIXEDMAP;
 #else
 	vm_flags_set(vma, VM_MIXEDMAP);
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drm.c
@@ -84,7 +84,7 @@ static int xocl_bo_mmap(struct file *filp, struct vm_area_struct *vma)
 		return -EINVAL;
 	}
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	/* Clear VM_PFNMAP flag set by drm_gem_mmap()
 	 * we have "struct page" for all backing pages for bo
 	 */
@@ -157,7 +157,7 @@ static int xocl_native_mmap(struct file *filp, struct vm_area_struct *vma)
 
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) && !defined(RHEL_9_5_GE)
 	vma->vm_flags |= VM_IO;
 	vma->vm_flags |= VM_RESERVED;
 #else
@@ -407,6 +407,11 @@ static uint xocl_poll(struct file *filp, poll_table *wait)
 	return xocl_poll_client(filp, wait, priv->driver_priv);
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0) || defined(RHEL_9_5_GE)
+/* This was removed in 6.8 */
+#define DRM_UNLOCKED 0
+#endif
+
 static const struct drm_ioctl_desc xocl_ioctls[] = {
 	DRM_IOCTL_DEF_DRV(XOCL_CREATE_BO, xocl_create_bo_ioctl,
 			  DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
@@ -541,7 +546,9 @@ static struct drm_driver mm_drm_driver = {
 	.fops				= &xocl_driver_fops,
 
 	.gem_prime_import_sg_table	= xocl_gem_prime_import_sg_table,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 6, 0) && !defined(RHEL_9_4_GE)
 	.gem_prime_mmap			= xocl_gem_prime_mmap,
+#endif
 
 	.prime_handle_to_fd		= drm_gem_prime_handle_to_fd,
 	.prime_fd_to_handle		= drm_gem_prime_fd_to_handle,
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c b/src/runtime_src/core/pcie/driver/linux/xocl/userpf/xocl_drv.c
@@ -1583,7 +1583,7 @@ static int xocl_cma_mem_alloc(struct xocl_dev *xdev, uint64_t size)
 		return -EINVAL;
 	}
 
-	if (page_sz > (PAGE_SIZE << (MAX_ORDER-1))) {
+	if (page_sz > (PAGE_SIZE*MAX_ORDER_NR_PAGES)) {
 		DRM_WARN("Unable to allocate with page size 0x%llx", page_sz);
 		return -EINVAL;
 	}
@@ -1992,7 +1992,7 @@ static int __init xocl_init(void)
 {
 	int		ret, i = 0;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0) && !defined(RHEL_9_4_GE)
 	xrt_class = class_create(THIS_MODULE, "xrt_user");
 #else
 	xrt_class = class_create("xrt_user");
diff --git a/src/runtime_src/core/pcie/driver/linux/xocl/xocl_drv.h b/src/runtime_src/core/pcie/driver/linux/xocl/xocl_drv.h
@@ -169,6 +169,12 @@
 #endif
 
 #if defined(RHEL_RELEASE_CODE)
+#if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 5)
+#define RHEL_9_5_GE
+#endif
+#if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 4)
+#define RHEL_9_4_GE
+#endif
 #if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(9, 2)
 #define RHEL_9_2_GE
 #endif
