Skip to content

Commit

Permalink
kni: fix build with Linux 6.3
Browse files Browse the repository at this point in the history
[ upstream commit 5f34cc454df420b9b2da8deb949fb76cba058b87 ]

KNI calls `get_user_pages_remote()` API which is using `FOLL_TOUCH`
flag, but `FOLL_TOUCH` is no more in public headers since v6.3,
causing a build error.

`FOLL_*` defines in Linux kernel first moved to another header [1],
later some of them moved to memory subsystem internal header [2] for 6.3

`get_user_pages_remote()` already sets `FOLL_TOUCH` internally,
no need to set this flag externally anyway, moving flag from the call
altogether.

[1]
Commit b5054174ac7c ("mm: move FOLL_* defs to mm_types.h")

[2]
Commit 2c2241081f7d ("mm/gup: move private gup FOLL_ flags to internal.h")

Fixes: e73831d ("kni: support userspace VA")

Signed-off-by: Ferruh Yigit <ferruh.yigit@amd.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
  • Loading branch information
ferruhy authored and kevintraynor committed Jul 11, 2023
1 parent e185150 commit b22ddfe
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions kernel/linux/kni/kni_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,9 @@ static inline phys_addr_t iova_to_phys(struct task_struct *tsk,

/* 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);
ret = get_user_pages_remote(tsk, tsk->mm, iova, 1, 0, &page, NULL, NULL);
#else
ret = get_user_pages_remote(tsk->mm, iova, 1,
FOLL_TOUCH, &page, NULL, NULL);
ret = get_user_pages_remote(tsk->mm, iova, 1, 0, &page, NULL, NULL);
#endif
if (ret < 0)
return 0;
Expand Down

0 comments on commit b22ddfe

Please sign in to comment.