Skip to contentSkip to conversation

kni: fix build with Linux 5.9

PATCH In review Min Hu (Connor) 2 participants 2 messages Sep 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kni: fix build with Linux 5.9

Build error seen with Linux kernel 5.9.

Build error:
kernel/linux/kni/kni_dev.h:104:30:
error: passing argument 1 of ‘get_user_pages_remote’ from incompatible pointer type [-Werror=incompatible-pointer-types] ret = get_user_pages_remote(tsk, tsk->mm, iova, 1,

get_user_pages_remote() is changed in Linux kernel version 5.9 and remove a parameter, struct task_struct *tsk:
Linux Commit 64019a2e467a ("mm/gup: remove task_struct pointer for all gup code")

get_user_pages_remote() parameter updated with compile time Linux kernel version check.

---
 kernel/linux/kni/kni_dev.h | 5 +++++
 1 file changed, 5 insertions(+)
kernel/linux/kni/kni_dev.h +5 -0
index ca5f92a..192c3d9 100644
@@ -101,8 +101,13 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk,
 	offset = iova & (PAGE_SIZE - 1);
 
 	/* Read one page struct info */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+	ret = get_user_pages_remote(tsk->mm, iova, 1,
+				    FOLL_TOUCH, &page, NULL, NULL);
+#else
 	ret = get_user_pages_remote(tsk, tsk->mm, iova, 1,
 				    FOLL_TOUCH, &page, NULL, NULL);
+#endif /* >= 5.9.0 */
 	if (ret < 0)
 		return 0;
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 33 lines · Min Hu (Connor)

Build error seen with Linux kernel 5.9.

Build error:
kernel/linux/kni/kni_dev.h:104:30:
error: passing argument 1 of ‘get_user_pages_remote’ from incompatible pointer type [-Werror=incompatible-pointer-types] ret = get_user_pages_remote(tsk, tsk->mm, iova, 1,

get_user_pages_remote() is changed in Linux kernel version 5.9 and remove a parameter, struct task_struct *tsk:
Linux Commit 64019a2e467a ("mm/gup: remove task_struct pointer for all gup code")

get_user_pages_remote() parameter updated with compile time Linux kernel version check.

---
 kernel/linux/kni/kni_dev.h | 5 +++++
 1 file changed, 5 insertions(+)
kernel/linux/kni/kni_dev.h +0 -0
index ca5f92a..192c3d9 100644
@@ -101,8 +101,13 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk,
 	offset = iova & (PAGE_SIZE - 1);
 
 	/* Read one page struct info */

kernel/linux/kni/kni_dev.h static inline phys_addr_t iova_to_phys(struct task_struct *tsk, · line 113

Quoted 10 lines
kernel/linux/kni/kni_dev.h +5 -0
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+	ret = get_user_pages_remote(tsk->mm, iova, 1,
+				    FOLL_TOUCH, &page, NULL, NULL);
+#else
 	ret = get_user_pages_remote(tsk, tsk->mm, iova, 1,
 				    FOLL_TOUCH, &page, NULL, NULL);
+#endif /* >= 5.9.0 */
 	if (ret < 0)
 		return 0;
 

The patch is already out, please check: https://patches.dpdk.org/patch/75577/

If you are already on it, an ack or review tag would be good. Thanks.