selftests-mm-drop-global-mem_fd-in-uffd-tests.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: drop global mem_fd in uffd tests
has been removed from the -mm tree. Its filename was
selftests-mm-drop-global-mem_fd-in-uffd-tests.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: Peter Xu <[email protected]>
Subject: selftests/mm: drop global mem_fd in uffd tests
Date: Wed, 12 Apr 2023 12:43:31 -0400
Drop it by creating the memfd dynamically in the tests.
---
tools/testing/selftests/mm/uffd-common.c | 28 ++++++++++++++++++++- tools/testing/selftests/mm/uffd-common.h | 2 - tools/testing/selftests/mm/uffd-stress.c | 15 ----------- 3 files changed, 28 insertions(+), 17 deletions(-)
tools/testing/selftests/mm/uffd-common.c renamed from tools/testing/selftests/mm/uffd-common.c~selftests-mm-drop-global-mem_fd-in-uffd-tests +27 -1
@@ -12,12 +12,32 @@volatile bool test_uffdio_copy_eexist = true;unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size, hpage_size;char *area_src, *area_src_alias, *area_dst, *area_dst_alias, *area_remap; -int mem_fd, uffd =-1 , uffd_flags, finished, *pipefd, test_type; +int uffd =-1 , uffd_flags, finished, *pipefd, test_type;bool map_shared, test_collapse, test_dev_userfaultfd;bool test_uffdio_wp = true, test_uffdio_minor = false;unsigned long long *count_verify;uffd_test_ops_t *uffd_test_ops; +static int uffd_mem_fd_create (off_t mem_size,bool hugetlb) +{ +unsigned int memfd_flags =0 ; +int mem_fd; + +if (hugetlb) + memfd_flags =MFD_HUGETLB ; + mem_fd =memfd_create ("uffd-test" , memfd_flags); +if (mem_fd <0 ) +err ("memfd_create" ); +if (ftruncate (mem_fd, mem_size)) +err ("ftruncate" ); +if (fallocate (mem_fd, +FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE ,0 , + mem_size)) +err ("fallocate" ); + +return mem_fd; +} +static void anon_release_pages (char *rel_area) {if (madvise (rel_area, nr_pages * page_size,MADV_DONTNEED ))
@@ -51,6 +71,7 @@ static void hugetlb_allocate_area(void *off_t offset = is_src ?0 : size;void *area_alias =NULL ;char **alloc_area_alias; +int mem_fd =uffd_mem_fd_create (size *2 , true); *alloc_area = mmap(NULL, size, PROT_READ | PROT_WRITE, (map_shared ? MAP_SHARED : MAP_PRIVATE) |
@@ -73,6 +94,8 @@ static void hugetlb_allocate_area(void * }if (area_alias) *alloc_area_alias = area_alias; + +close (mem_fd); }static void hugetlb_alias_mapping (__u64 *start,size_t len,unsigned long offset)
@@ -95,6 +118,7 @@ static void shmem_allocate_area(void **asize_t bytes = nr_pages * page_size;unsigned long offset = is_src ?0 : bytes;char *p =NULL , *p_alias =NULL ; +int mem_fd =uffd_mem_fd_create (bytes *2 , false);if (test_collapse) { p =BASE_PMD_ADDR ;
@@ -124,6 +148,8 @@ static void shmem_allocate_area(void **a area_src_alias = area_alias; else area_dst_alias = area_alias; + +close (mem_fd); }static void shmem_alias_mapping (__u64 *start,size_t len,unsigned long offset)
tools/testing/selftests/mm/uffd-common.h renamed from tools/testing/selftests/mm/uffd-common.h~selftests-mm-drop-global-mem_fd-in-uffd-tests +1 -1
@@ -87,7 +87,7 @@ typedef struct uffd_test_ops uffd_test_oextern unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size, hpage_size;extern char *area_src, *area_src_alias, *area_dst, *area_dst_alias, *area_remap; -extern int mem_fd, uffd, uffd_flags, finished, *pipefd, test_type; +extern int uffd, uffd_flags, finished, *pipefd, test_type;extern bool map_shared, test_collapse, test_dev_userfaultfd;extern bool test_uffdio_wp, test_uffdio_minor;extern unsigned long long *count_verify;
tools/testing/selftests/mm/uffd-stress.c renamed from tools/testing/selftests/mm/uffd-stress.c~selftests-mm-drop-global-mem_fd-in-uffd-tests +0 -15
@@ -1090,21 +1090,6 @@ int main(int argc, char **argv) } nr_pages = nr_pages_per_cpu * nr_cpus; -if (test_type ==TEST_SHMEM || test_type ==TEST_HUGETLB ) { -unsigned int memfd_flags =0 ; - -if (test_type ==TEST_HUGETLB ) - memfd_flags =MFD_HUGETLB ; - mem_fd =memfd_create (argv[0 ], memfd_flags); -if (mem_fd <0 ) -err ("memfd_create" ); -if (ftruncate (mem_fd, nr_pages * page_size *2 )) -err ("ftruncate" ); -if (fallocate (mem_fd, -FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE ,0 , - nr_pages * page_size *2 )) -err ("fallocate" ); - }printf ("nr_pages: %lu, nr_pages_per_cpu: %lu\n" , nr_pages, nr_pages_per_cpu);return userfaultfd_stress ();
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-drop-global-hpage_size-in-uffd-tests.patch selftests-mm-rename-uffd_stats-to-uffd_args.patch selftests-mm-let-uffd_handle_page_fault-take-wp-parameter.patch selftests-mm-allow-allocate_area-to-fail-properly.patch selftests-mm-add-framework-for-uffd-unit-test.patch selftests-mm-move-uffd-pagemap-test-to-unit-test.patch selftests-mm-move-uffd-minor-test-to-unit-test.patch selftests-mm-move-uffd-sig-events-tests-into-uffd-unit-tests.patch selftests-mm-move-zeropage-test-into-uffd-unit-tests.patch selftests-mm-workaround-no-way-to-detect-uffd-minor-wp.patch selftests-mm-allow-uffd-test-to-skip-properly-with-no-privilege.patch selftests-mm-drop-sys-dev-test-in-uffd-stress-test.patch selftests-mm-add-shmem-private-test-to-uffd-stress.patch selftests-mm-add-uffdio-register-ioctls-test.patch mm-hugetlb-fix-uffd-wp-during-fork.patch mm-hugetlb-fix-uffd-wp-bit-lost-when-unsharing-happens.patch selftests-mm-add-a-few-options-for-uffd-unit-test.patch selftests-mm-extend-and-rename-uffd-pagemap-test.patch selftests-mm-rename-cow_extra_libs-to-iouring_extra_libs.patch selftests-mm-add-tests-for-ro-pinning-vs-fork.patch