Commit e8a42240 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Andrew Morton
Browse files

selftests/mm: add uffd_test_case_ops to allow test case-specific operations 

Currently each test can specify unique operations using uffd_test_ops,
however these operations are per-memory type and not per-test.  Add
uffd_test_case_ops which each test case can customize for its own needs
regardless of the memory type being used.  Pre- and post-allocation
operations are added, some of which will be used in the next patch to
implement test-specific operations like madvise after memory is allocated
but before it is accessed.

Link: https://lkml.kernel.org/r/20231206103702.3873743-5-surenb@google.com


Signed-off-by: default avatarSuren Baghdasaryan <surenb@google.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Cc: Brian Geffon <bgeffon@google.com>
Cc: Christian Brauner <brauner@kernel.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jann Horn <jannh@google.com>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Lokesh Gidra <lokeshgidra@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Nicolas Geoffray <ngeoffray@google.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: ZhangPeng <zhangpeng362@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 1c8d39fa

tools/testing/selftests/mm/uffd-common.c

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ bool map_shared; 
bool test_uffdio_wp = true;

unsigned long long *count_verify;

uffd_test_ops_t *uffd_test_ops;

uffd_test_case_ops_t *uffd_test_case_ops;



static int uffd_mem_fd_create(off_t mem_size, bool hugetlb)

{
@@ -298,6 +299,12 @@ int uffd_test_ctx_init(uint64_t features, const char **errmsg) 
	unsigned long nr, cpu;

	int ret;



	if (uffd_test_case_ops && uffd_test_case_ops->pre_alloc) {

		ret = uffd_test_case_ops->pre_alloc(errmsg);

		if (ret)

			return ret;

	}



	ret = uffd_test_ops->allocate_area((void **)&area_src, true);

	ret |= uffd_test_ops->allocate_area((void **)&area_dst, false);

	if (ret) {
@@ -306,6 +313,12 @@ int uffd_test_ctx_init(uint64_t features, const char **errmsg) 
		return ret;

	}



	if (uffd_test_case_ops && uffd_test_case_ops->post_alloc) {

		ret = uffd_test_case_ops->post_alloc(errmsg);

		if (ret)

			return ret;

	}



	ret = userfaultfd_open(&features);

	if (ret) {

		if (errmsg)

tools/testing/selftests/mm/uffd-common.h

+7 −0
Original line number Diff line number Diff line
@@ -90,6 +90,12 @@ struct uffd_test_ops { 
};

typedef struct uffd_test_ops uffd_test_ops_t;



struct uffd_test_case_ops {

	int (*pre_alloc)(const char **errmsg);

	int (*post_alloc)(const char **errmsg);

};

typedef struct uffd_test_case_ops uffd_test_case_ops_t;



extern unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size;

extern char *area_src, *area_src_alias, *area_dst, *area_dst_alias, *area_remap;

extern int uffd, uffd_flags, finished, *pipefd, test_type;
@@ -102,6 +108,7 @@ extern uffd_test_ops_t anon_uffd_test_ops; 
extern uffd_test_ops_t shmem_uffd_test_ops;

extern uffd_test_ops_t hugetlb_uffd_test_ops;

extern uffd_test_ops_t *uffd_test_ops;

extern uffd_test_case_ops_t *uffd_test_case_ops;



void uffd_stats_report(struct uffd_args *args, int n_cpus);

int uffd_test_ctx_init(uint64_t features, const char **errmsg);

tools/testing/selftests/mm/uffd-unit-tests.c

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ typedef struct { 
	uffd_test_fn uffd_fn;

	unsigned int mem_targets;

	uint64_t uffd_feature_required;

	uffd_test_case_ops_t *test_case_ops;

} uffd_test_case_t;



static void uffd_test_report(void)
@@ -185,6 +186,7 @@ uffd_setup_environment(uffd_test_args_t *args, uffd_test_case_t *test, 
{

	map_shared = mem_type->shared;

	uffd_test_ops = mem_type->mem_ops;

	uffd_test_case_ops = test->test_case_ops;



	if (mem_type->mem_flag & (MEM_HUGETLB_PRIVATE | MEM_HUGETLB))

		page_size = default_huge_page_size();