selftests-mm-add-framework-for-uffd-unit-test.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: add framework for uffd-unit-test
has been removed from the -mm tree. Its filename was
selftests-mm-add-framework-for-uffd-unit-test.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: add framework for uffd-unit-test
Date: Wed, 12 Apr 2023 12:43:48 -0400
Add a framework to be prepared to move unit tests from uffd-stress.c into uffd-unit-tests.c. The goal is to allow detection of uffd features for each test, and also loop over specified types of memory that a test support.
---
tools/testing/selftests/mm/uffd-unit-tests.c | 124 +++++++++++++++++ tools/testing/selftests/mm/vm_util.c | 37 +++++ tools/testing/selftests/mm/vm_util.h | 2 3 files changed, 163 insertions(+)
tools/testing/selftests/mm/uffd-unit-tests.c renamed from tools/testing/selftests/mm/uffd-unit-tests.c~selftests-mm-add-framework-for-uffd-unit-test +124 -0
@@ -9,6 +9,66 @@#ifdef __NR_userfaultfd +/* The unit test doesn't need a large or random size, make it 32MB for now */ +#define UFFD_TEST_MEM_SIZE (32UL << 20) + +#define MEM_ANON BIT_ULL(0) +#define MEM_SHMEM BIT_ULL(1) +#define MEM_SHMEM_PRIVATE BIT_ULL(2) +#define MEM_HUGETLB BIT_ULL(3) +#define MEM_HUGETLB_PRIVATE BIT_ULL(4) + +struct mem_type { +const char *name; +unsigned int mem_flag; +uffd_test_ops_t *mem_ops; +bool shared; +}; +typedef struct mem_type mem_type_t ; + +mem_type_t mem_types[] = { + { + .name ="anon" , + .mem_flag =MEM_ANON , + .mem_ops = &anon_uffd_test_ops, + .shared = false, + }, + { + .name ="shmem" , + .mem_flag =MEM_SHMEM , + .mem_ops = &shmem_uffd_test_ops, + .shared = true, + }, + { + .name ="shmem-private" , + .mem_flag =MEM_SHMEM_PRIVATE , + .mem_ops = &shmem_uffd_test_ops, + .shared = false, + }, + { + .name ="hugetlb" , + .mem_flag =MEM_HUGETLB , + .mem_ops = &hugetlb_uffd_test_ops, + .shared = true, + }, + { + .name ="hugetlb-private" , + .mem_flag =MEM_HUGETLB_PRIVATE , + .mem_ops = &hugetlb_uffd_test_ops, + .shared = false, + }, +}; + +/* Returns: UFFD_TEST_* */ +typedef void (*uffd_test_fn )(void ); + +typedef struct { +const char *name; +uffd_test_fn uffd_fn; +unsigned int mem_targets; +uint64_t uffd_feature_required; +}uffd_test_case_t ; +static void uffd_test_report (void ) { printf("Userfaults unit tests: pass=%u, skip=%u, fail=%u (total=%u)\n",
@@ -105,9 +165,50 @@ out:return 1 ; } +/* +* This function initializes the global variables. TODO: remove global +* vars and then remove this. +*/ +static int uffd_setup_environment (uffd_test_case_t *test,mem_type_t *mem_type) +{ + map_shared = mem_type->shared; + uffd_test_ops = mem_type->mem_ops; + +if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE |MEM_HUGETLB )) + page_size =default_huge_page_size (); +else + page_size =psize (); + + nr_pages =UFFD_TEST_MEM_SIZE / page_size; +/* TODO: remove this global var.. it's so ugly */ + nr_cpus =1 ; + +return uffd_test_ctx_init (test->uffd_feature_required); +} + +static bool uffd_feature_supported (uffd_test_case_t *test) +{ +uint64_t features; + +if (uffd_get_features (&features)) +return false; + +return (features & test->uffd_feature_required) == + test->uffd_feature_required; +} + +uffd_test_case_t uffd_tests[] = { +}; +int main (int argc,char *argv[]) { +int n_tests =sizeof (uffd_tests) /sizeof (uffd_test_case_t); +int n_mems =sizeof (mem_types) /sizeof (mem_type_t); +uffd_test_case_t *test; +mem_type_t *mem_type; +char test_name[128 ];int has_uffd; +int i, j; has_uffd =test_uffd_api (false); has_uffd |=test_uffd_api (true);
@@ -116,6 +217,29 @@ int main(int argc, char *argv[])printf ("Userfaultfd not supported or unprivileged, skip all tests\n" );exit (KSFT_SKIP ); } + +for (i =0 ; i < n_tests; i++) { + test = &uffd_tests[i]; +for (j =0 ; j < n_mems; j++) { + mem_type = &mem_types[j]; +if (!(test->mem_targets & mem_type->mem_flag)) +continue ; +snprintf (test_name,sizeof (test_name), +"%s on %s" , test->name, mem_type->name); + +uffd_test_start (test_name); +if (!uffd_feature_supported (test)) { +uffd_test_skip ("feature missing" ); +continue ; + } +if (uffd_setup_environment (test, mem_type)) { +uffd_test_skip ("environment setup failed" ); +continue ; + } + test->uffd_fn (); + } + } +uffd_test_report ();return ksft_get_fail_cnt () ?KSFT_FAIL :KSFT_PASS ;
tools/testing/selftests/mm/vm_util.c renamed from tools/testing/selftests/mm/vm_util.c~selftests-mm-add-framework-for-uffd-unit-test +37 -0
@@ -254,3 +254,40 @@ int uffd_open_sys(unsigned int flags)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/vm_util.h renamed from tools/testing/selftests/mm/vm_util.h~selftests-mm-add-framework-for-uffd-unit-test +2 -0
@@ -50,6 +50,8 @@ int uffd_register(int uffd, void *addr,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);/* * On ppc64 this will only work with radix 2M hugepage size
_
Patches currently in -mm which might be from [email protected] are
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