selftests-mm-move-certain-uffd-routines-from-vm_utilc-to-uffd-commonc.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: move certain uffd*() routines from vm_util.c to uffd-common.c
has been removed from the -mm tree. Its filename was
selftests-mm-move-certain-uffd-routines-from-vm_utilc-to-uffd-commonc.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: John Hubbard <[email protected]>
Subject: selftests/mm: move certain uffd*() routines from vm_util.c to uffd-common.c
Date: Tue, 6 Jun 2023 00:16:35 -0700
There are only three uffd*() routines that are used outside of the uffd selftests. Leave these in vm_util.c, where they are available to any mm selftest program:
uffd_register()
uffd_unregister()
uffd_register_with_ioctls().
A few other uffd*() routines, however, are only used by the uffd-focused tests found in uffd-stress.c and uffd-unit-tests.c. Move those routines into uffd-common.c.
---
tools/testing/selftests/mm/uffd-common.c | 59 +++++++++++++++++++++ tools/testing/selftests/mm/uffd-common.h | 5 + tools/testing/selftests/mm/vm_util.c | 59 --------------------- tools/testing/selftests/mm/vm_util.h | 4 - 4 files changed, 64 insertions(+), 63 deletions(-)
tools/testing/selftests/mm/uffd-common.c renamed from tools/testing/selftests/mm/uffd-common.c~selftests-mm-move-certain-uffd-routines-from-vm_utilc-to-uffd-commonc +59 -0
@@ -616,3 +616,62 @@ int copy_page(int ufd, unsigned long off {return __copy_page (ufd, offset, false, wp); } + +int uffd_open_dev (unsigned int flags) +{ +int fd, uffd; + + fd =open ("/dev/userfaultfd" ,O_RDWR |O_CLOEXEC ); +if (fd <0 ) +return fd; + uffd =ioctl (fd,USERFAULTFD_IOC_NEW , flags); +close (fd); + +return uffd; +} + +int uffd_open_sys (unsigned int flags) +{ +#ifdef __NR_userfaultfd +return syscall (__NR_userfaultfd, flags); +#else +return -1 ; +#endif +} + +int uffd_open (unsigned int flags) +{ +int uffd =uffd_open_sys (flags); + +if (uffd <0 ) + uffd =uffd_open_dev (flags); + +return uffd; +} + +int uffd_get_features (uint64_t *features) +{ +struct uffdio_api uffdio_api = { .api =UFFD_API , .features =0 }; +/* +* This should by default work in most kernels; the feature list +* will be the same no matter what we pass in here. +*/ +int fd =uffd_open (UFFD_USER_MODE_ONLY ); + +if (fd <0 ) +/* Maybe the kernel is older than user-only mode? */ + fd =uffd_open (0 ); + +if (fd <0 ) +return fd; + +if (ioctl (fd,UFFDIO_API , &uffdio_api)) { +close (fd); +return -errno; + } + + *features = uffdio_api.features; +close (fd); + +return 0 ; +}
tools/testing/selftests/mm/uffd-common.h renamed from tools/testing/selftests/mm/uffd-common.h~selftests-mm-move-certain-uffd-routines-from-vm_utilc-to-uffd-commonc +5 -0
@@ -110,6 +110,11 @@ int __copy_page(int ufd, unsigned long oint copy_page (int ufd,unsigned long offset,bool wp);void *uffd_poll_thread (void *arg); +int uffd_open_dev (unsigned int flags); +int uffd_open_sys (unsigned int flags); +int uffd_open (unsigned int flags); +int uffd_get_features (uint64_t *features); +#define TEST_ANON 1#define TEST_HUGETLB 2#define TEST_SHMEM 3
tools/testing/selftests/mm/vm_util.c renamed from tools/testing/selftests/mm/vm_util.c~selftests-mm-move-certain-uffd-routines-from-vm_utilc-to-uffd-commonc +0 -59
62 lines not on this page · raw message
tools/testing/selftests/mm/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~selftests-mm-move-certain-uffd-routines-from-vm_utilc-to-uffd-commonc +0 -4
@@ -49,10 +49,6 @@ int detect_hugetlb_page_sizes(size_t sizint uffd_register (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor);int uffd_unregister (int uffd,void *addr,uint64_t len); -int uffd_open_dev (unsigned int flags); -int uffd_open_sys (unsigned int flags); -int uffd_open (unsigned int flags); -int uffd_get_features (uint64_t *features);int uffd_register_with_ioctls (int uffd,void *addr,uint64_t len,bool miss,bool wp,bool minor,uint64_t *ioctls);
_
Patches currently in -mm which might be from [email protected] are