From: Suren Baghdasaryan <surenb@google.com>
To: akpm@linux-foundation.org
Cc: viro@zeniv.linux.org.uk, brauner@kernel.org, shuah@kernel.org,
aarcange@redhat.com, lokeshgidra@google.com, peterx@redhat.com,
david@redhat.com, ryan.roberts@arm.com, hughd@google.com,
mhocko@suse.com, axelrasmussen@google.com, rppt@kernel.org,
willy@infradead.org, Liam.Howlett@oracle.com, jannh@google.com,
zhangpeng362@huawei.com, bgeffon@google.com,
kaleshsingh@google.com, ngeoffray@google.com, jdduke@google.com,
surenb@google.com, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-kselftest@vger.kernel.org, kernel-team@android.com
Subject: [PATCH v6 3/5] selftests/mm: call uffd_test_ctx_clear at the end of the test
Date: Wed, 6 Dec 2023 02:36:57 -0800 [thread overview]
Message-ID: <20231206103702.3873743-4-surenb@google.com> (raw)
In-Reply-To: <20231206103702.3873743-1-surenb@google.com>
uffd_test_ctx_clear() is being called from uffd_test_ctx_init() to unmap
areas used in the previous test run. This approach is problematic because
while unmapping areas uffd_test_ctx_clear() uses page_size and nr_pages
which might differ from one test run to another.
Fix this by calling uffd_test_ctx_clear() after each test is done.
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Axel Rasmussen <axelrasmussen@google.com>
---
tools/testing/selftests/mm/uffd-common.c | 4 +---
tools/testing/selftests/mm/uffd-common.h | 1 +
tools/testing/selftests/mm/uffd-stress.c | 5 ++++-
tools/testing/selftests/mm/uffd-unit-tests.c | 1 +
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c
index 02b89860e193..583e5a4cc0fd 100644
--- a/tools/testing/selftests/mm/uffd-common.c
+++ b/tools/testing/selftests/mm/uffd-common.c
@@ -262,7 +262,7 @@ static inline void munmap_area(void **area)
*area = NULL;
}
-static void uffd_test_ctx_clear(void)
+void uffd_test_ctx_clear(void)
{
size_t i;
@@ -298,8 +298,6 @@ int uffd_test_ctx_init(uint64_t features, const char **errmsg)
unsigned long nr, cpu;
int ret;
- uffd_test_ctx_clear();
-
ret = uffd_test_ops->allocate_area((void **)&area_src, true);
ret |= uffd_test_ops->allocate_area((void **)&area_dst, false);
if (ret) {
diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h
index 7c4fa964c3b0..870776b5a323 100644
--- a/tools/testing/selftests/mm/uffd-common.h
+++ b/tools/testing/selftests/mm/uffd-common.h
@@ -105,6 +105,7 @@ extern uffd_test_ops_t *uffd_test_ops;
void uffd_stats_report(struct uffd_args *args, int n_cpus);
int uffd_test_ctx_init(uint64_t features, const char **errmsg);
+void uffd_test_ctx_clear(void);
int userfaultfd_open(uint64_t *features);
int uffd_read_msg(int ufd, struct uffd_msg *msg);
void wp_range(int ufd, __u64 start, __u64 len, bool wp);
diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c
index 469e0476af26..7e83829bbb33 100644
--- a/tools/testing/selftests/mm/uffd-stress.c
+++ b/tools/testing/selftests/mm/uffd-stress.c
@@ -323,8 +323,10 @@ static int userfaultfd_stress(void)
uffd_stats_reset(args, nr_cpus);
/* bounce pass */
- if (stress(args))
+ if (stress(args)) {
+ uffd_test_ctx_clear();
return 1;
+ }
/* Clear all the write protections if there is any */
if (test_uffdio_wp)
@@ -354,6 +356,7 @@ static int userfaultfd_stress(void)
uffd_stats_report(args, nr_cpus);
}
+ uffd_test_ctx_clear();
return 0;
}
diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c
index 2709a34a39c5..e7d43c198041 100644
--- a/tools/testing/selftests/mm/uffd-unit-tests.c
+++ b/tools/testing/selftests/mm/uffd-unit-tests.c
@@ -1319,6 +1319,7 @@ int main(int argc, char *argv[])
continue;
}
test->uffd_fn(&args);
+ uffd_test_ctx_clear();
}
}
--
2.43.0.rc2.451.g8631bc7472-goog
next prev parent reply other threads:[~2023-12-06 10:37 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-06 10:36 [PATCH v6 0/5] userfaultfd move option Suren Baghdasaryan
2023-12-06 10:36 ` [PATCH v6 1/5] mm/rmap: support move to different root anon_vma in folio_move_anon_rmap() Suren Baghdasaryan
2023-12-06 10:36 ` [PATCH v6 2/5] userfaultfd: UFFDIO_MOVE uABI Suren Baghdasaryan
2023-12-06 10:36 ` Suren Baghdasaryan [this message]
2023-12-06 10:36 ` [PATCH v6 4/5] selftests/mm: add uffd_test_case_ops to allow test case-specific operations Suren Baghdasaryan
2023-12-06 10:36 ` [PATCH v6 5/5] selftests/mm: add UFFDIO_MOVE ioctl test Suren Baghdasaryan
2023-12-10 14:23 ` Mark Brown
2023-12-11 1:01 ` Suren Baghdasaryan
2023-12-11 3:04 ` Suren Baghdasaryan
2023-12-11 11:15 ` Mark Brown
2023-12-11 12:03 ` David Hildenbrand
2023-12-11 12:24 ` Mark Brown
2023-12-11 16:15 ` Suren Baghdasaryan
2023-12-11 16:25 ` Mark Brown
2023-12-11 16:29 ` Suren Baghdasaryan
2023-12-11 16:34 ` Mark Brown
2023-12-11 16:43 ` Suren Baghdasaryan
2023-12-11 16:32 ` David Hildenbrand
2023-12-11 16:41 ` Mark Brown
2023-12-11 16:53 ` David Hildenbrand
2023-12-11 17:32 ` Mark Brown
2023-12-11 18:00 ` David Hildenbrand
2023-12-11 20:01 ` Mark Brown
2023-12-11 20:11 ` John Hubbard
2023-12-12 15:27 ` David Hildenbrand
2023-12-12 19:39 ` Mark Brown
2023-12-11 18:46 ` John Hubbard
2023-12-11 20:21 ` Mark Brown
2023-12-11 20:29 ` John Hubbard
2023-12-12 15:12 ` Mark Brown
2023-12-13 2:14 ` John Hubbard
2023-12-13 3:58 ` Muhammad Usama Anjum
2023-12-13 5:52 ` John Hubbard
2023-12-13 5:55 ` John Hubbard
2023-12-13 9:59 ` David Hildenbrand
2023-12-13 22:01 ` John Hubbard
2023-12-14 9:02 ` David Hildenbrand
2023-12-13 14:00 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231206103702.3873743-4-surenb@google.com \
--to=surenb@google.com \
--cc=Liam.Howlett@oracle.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=axelrasmussen@google.com \
--cc=bgeffon@google.com \
--cc=brauner@kernel.org \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=jannh@google.com \
--cc=jdduke@google.com \
--cc=kaleshsingh@google.com \
--cc=kernel-team@android.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lokeshgidra@google.com \
--cc=mhocko@suse.com \
--cc=ngeoffray@google.com \
--cc=peterx@redhat.com \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=shuah@kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.org \
--cc=zhangpeng362@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).