shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Suren 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: Andrew Morton <akpm@linux-foundation.org>

(cherry picked from commit e8a422408ba9760e2640ca57e4b79c3dd7f48bd2)
Conflicts:
	tools/testing/selftests/mm/uffd-common.c
	tools/testing/selftests/mm/uffd-common.h
	tools/testing/selftests/mm/uffd-unit-tests.c
	tools/testing/selftests/vm/userfaultfd.c

1. Userfaultfd selftest was split into separate uffd-* files and moved
   to selftests/mm.
2. In 6.1 there is no mechanism to run individual unit-tests. All
   unit-tests are run after stress test. Consequently, the tests are not
   abstracted using 'uffd_test_case_t'. Therefore, added
   'uffd_test_case_ops' as a parameter to uffd_test_ctx_init().

Bug: 274911254
Change-Id: I6480abf1709ca717d9baad5047bf675852f10726
Signed-off-by: Lokesh Gidra <lokeshgidra@google.com>
This commit is contained in:
Suren Baghdasaryan
2023-12-06 02:36:58 -08:00
committed by Lokesh Gidra
parent ee72d5a7d9
commit a5d504c067
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/testing/selftests/vm/userfaultfd.c
View File

@@ -365,6 +365,11 @@ static void shmem_check_pmd_mapping(void *p, int expect_nr_hpages)
expect_nr_hpages);
}
struct uffd_test_case_ops {
void (*pre_alloc)();
void (*post_alloc)();
};
struct uffd_test_ops {
void (*allocate_area)(void **alloc_area, bool is_src);
void (*release_pages)(char *rel_area);
@@ -513,13 +518,20 @@ static void uffd_test_ctx_clear(void)
munmap_area((void **)&area_remap);
}
static void uffd_test_ctx_init(uint64_t features)
static void uffd_test_ctx_init(uint64_t features,
struct uffd_test_case_ops *uffd_test_case_ops)
{
unsigned long nr, cpu;
if (uffd_test_case_ops && uffd_test_case_ops->pre_alloc)
uffd_test_case_ops->pre_alloc();
uffd_test_ops->allocate_area((void **)&area_src, true);
uffd_test_ops->allocate_area((void **)&area_dst, false);
if (uffd_test_case_ops && uffd_test_case_ops->post_alloc)
uffd_test_case_ops->post_alloc();
userfaultfd_open(&features);
count_verify = malloc(nr_pages * sizeof(unsigned long long));
@@ -1176,7 +1188,7 @@ static int userfaultfd_zeropage_test(void)
printf("testing UFFDIO_ZEROPAGE: ");
fflush(stdout);
uffd_test_ctx_init(0);
uffd_test_ctx_init(0, NULL);
uffdio_register.range.start = (unsigned long) area_dst;
uffdio_register.range.len = nr_pages * page_size;
@@ -1213,7 +1225,7 @@ static int userfaultfd_events_test(void)
features = UFFD_FEATURE_EVENT_FORK | UFFD_FEATURE_EVENT_REMAP |
UFFD_FEATURE_EVENT_REMOVE;
uffd_test_ctx_init(features);
uffd_test_ctx_init(features, NULL);
fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK);
@@ -1270,7 +1282,7 @@ static int userfaultfd_sig_test(void)
fflush(stdout);
features = UFFD_FEATURE_EVENT_FORK|UFFD_FEATURE_SIGBUS;
uffd_test_ctx_init(features);
uffd_test_ctx_init(features, NULL);
fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK);
@@ -1353,7 +1365,7 @@ static int userfaultfd_minor_test(void)
printf("testing minor faults: ");
fflush(stdout);
uffd_test_ctx_init(uffd_minor_feature());
uffd_test_ctx_init(uffd_minor_feature(), NULL);
uffdio_register.range.start = (unsigned long)area_dst_alias;
uffdio_register.range.len = nr_pages * page_size;
@@ -1492,7 +1504,7 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize)
/* Flush so it doesn't flush twice in parent/child later */
fflush(stdout);
uffd_test_ctx_init(0);
uffd_test_ctx_init(0, NULL);
if (test_pgsize > page_size) {
/* This is a thp test */
@@ -1557,7 +1569,7 @@ static int userfaultfd_stress(void)
struct uffdio_register uffdio_register;
struct uffd_stats uffd_stats[nr_cpus];
uffd_test_ctx_init(0);
uffd_test_ctx_init(0, NULL);
if (posix_memalign(&area, page_size, page_size))
err("out of memory");