[PATCH] kni: fix build with Linux 6.5
Ferruh Yigit
ferruh.yigit at amd.com
Tue Jul 11 12:09:41 CEST 2023
The get_user_pages_remote() API has been modified in Linux kernel v6.5
[1], "struct vm_area_struct **vmas" parameter removed from the API.
To fix KNI build with Linux kernel v6.5, version check added around the
get_user_pages_remote() API.
[1]
ca5e863233e8 ("mm/gup: remove vmas parameter from get_user_pages_remote()")
Cc: stable at dpdk.org
Signed-off-by: Ferruh Yigit <ferruh.yigit at amd.com>
---
kernel/linux/kni/compat.h | 4 ++++
kernel/linux/kni/kni_dev.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 7aa6cd9fca75..8beb67046577 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -151,3 +151,7 @@
RHEL_RELEASE_VERSION(9, 1) <= RHEL_RELEASE_CODE))
#define HAVE_NETIF_RX_NI
#endif
+
+#if KERNEL_VERSION(6, 5, 0) > LINUX_VERSION_CODE
+#define HAVE_VMA_IN_GUP
+#endif
diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
index 21bfb6890e30..975379825b2d 100644
--- a/kernel/linux/kni/kni_dev.h
+++ b/kernel/linux/kni/kni_dev.h
@@ -107,7 +107,11 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk,
#ifdef HAVE_TSK_IN_GUP
ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, 0, &page, NULL, NULL);
#else
+ #ifdef HAVE_VMA_IN_GUP
ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL, NULL);
+ #else
+ ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL);
+ #endif
#endif
if (ret < 0)
return 0;
--
2.34.1
More information about the stable
mailing list