52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From: Ferruh Yigit <ferruh.yigit@intel.com>
|
|
Date: Mon, 17 Aug 2020 11:32:47 +0100
|
|
Message-Id: <20200817103247.1564204-1-ferruh.yigit@intel.com>
|
|
Subject: [dpdk-dev] [PATCH v2] kni: fix build with Linux 5.9
|
|
|
|
Starting from Linux 5.9 'get_user_pages_remote()' API doesn't get
|
|
'struct task_struct' parameter:
|
|
commit 64019a2e467a ("mm/gup: remove task_struct pointer for all gup code")
|
|
|
|
The change reflected to the KNI with version check.
|
|
|
|
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
|
|
---
|
|
v2:
|
|
* Add stable tag to request backport.
|
|
---
|
|
kernel/linux/kni/compat.h | 4 ++++
|
|
kernel/linux/kni/kni_dev.h | 5 +++++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
|
|
index 9ee45dbf6f..d515b27669 100644
|
|
--- a/kernel/linux/kni/compat.h
|
|
+++ b/kernel/linux/kni/compat.h
|
|
@@ -134,3 +134,7 @@
|
|
#if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE
|
|
#define HAVE_TX_TIMEOUT_TXQUEUE
|
|
#endif
|
|
+
|
|
+#if KERNEL_VERSION(5, 9, 0) > LINUX_VERSION_CODE
|
|
+#define HAVE_TSK_IN_GUP
|
|
+#endif
|
|
diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h
|
|
index ca5f92a47b..c15da311ba 100644
|
|
--- a/kernel/linux/kni/kni_dev.h
|
|
+++ b/kernel/linux/kni/kni_dev.h
|
|
@@ -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 */
|
|
+#ifdef HAVE_TSK_IN_GUP
|
|
ret = get_user_pages_remote(tsk, tsk->mm, iova, 1,
|
|
FOLL_TOUCH, &page, NULL, NULL);
|
|
+#else
|
|
+ ret = get_user_pages_remote(tsk->mm, iova, 1,
|
|
+ FOLL_TOUCH, &page, NULL, NULL);
|
|
+#endif
|
|
if (ret < 0)
|
|
return 0;
|
|
|
|
|