From: Peter Xu <peterx@redhat.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: David Hildenbrand <david@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
peterx@redhat.com, Andrea Arcangeli <aarcange@redhat.com>,
Nadav Amit <nadav.amit@gmail.com>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Axel Rasmussen <axelrasmussen@google.com>,
Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH v2 20/31] selftests/mm: Let uffd_handle_page_fault() take wp parameter
Date: Wed, 12 Apr 2023 12:43:41 -0400 [thread overview]
Message-ID: <20230412164341.328618-1-peterx@redhat.com> (raw)
In-Reply-To: <20230412163922.327282-1-peterx@redhat.com>
Make the handler optionally apply WP bit when resolving page faults for
either missing or minor page faults. This moves towards removing global
test_uffdio_wp outside of the common code.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tools/testing/selftests/mm/uffd-common.c | 17 +++++++++--------
tools/testing/selftests/mm/uffd-common.h | 6 ++++--
tools/testing/selftests/mm/uffd-stress.c | 16 ++++++++++------
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c
index e746405aa8f3..daa2a95408e6 100644
--- a/tools/testing/selftests/mm/uffd-common.c
+++ b/tools/testing/selftests/mm/uffd-common.c
@@ -353,7 +353,7 @@ void wp_range(int ufd, __u64 start, __u64 len, bool wp)
err("clear WP failed: address=0x%"PRIx64, (uint64_t)start);
}
-static void continue_range(int ufd, __u64 start, __u64 len)
+static void continue_range(int ufd, __u64 start, __u64 len, bool wp)
{
struct uffdio_continue req;
int ret;
@@ -361,7 +361,7 @@ static void continue_range(int ufd, __u64 start, __u64 len)
req.range.start = start;
req.range.len = len;
req.mode = 0;
- if (test_uffdio_wp)
+ if (wp)
req.mode |= UFFDIO_CONTINUE_MODE_WP;
if (ioctl(ufd, UFFDIO_CONTINUE, &req))
@@ -429,7 +429,8 @@ void uffd_handle_page_fault(struct uffd_msg *msg, struct uffd_args *args)
area_dst_alias));
for (b = 0; b < page_size; ++b)
area[b] = ~area[b];
- continue_range(uffd, msg->arg.pagefault.address, page_size);
+ continue_range(uffd, msg->arg.pagefault.address, page_size,
+ args->apply_wp);
args->minor_faults++;
} else {
/*
@@ -459,7 +460,7 @@ void uffd_handle_page_fault(struct uffd_msg *msg, struct uffd_args *args)
offset = (char *)(unsigned long)msg->arg.pagefault.address - area_dst;
offset &= ~(page_size-1);
- if (copy_page(uffd, offset))
+ if (copy_page(uffd, offset, args->apply_wp))
args->missing_faults++;
}
}
@@ -555,7 +556,7 @@ static void wake_range(int ufd, unsigned long addr, unsigned long len)
addr), exit(1);
}
-int __copy_page(int ufd, unsigned long offset, bool retry)
+int __copy_page(int ufd, unsigned long offset, bool retry, bool wp)
{
struct uffdio_copy uffdio_copy;
@@ -564,7 +565,7 @@ int __copy_page(int ufd, unsigned long offset, bool retry)
uffdio_copy.dst = (unsigned long) area_dst + offset;
uffdio_copy.src = (unsigned long) area_src + offset;
uffdio_copy.len = page_size;
- if (test_uffdio_wp)
+ if (wp)
uffdio_copy.mode = UFFDIO_COPY_MODE_WP;
else
uffdio_copy.mode = 0;
@@ -587,7 +588,7 @@ int __copy_page(int ufd, unsigned long offset, bool retry)
return 0;
}
-int copy_page(int ufd, unsigned long offset)
+int copy_page(int ufd, unsigned long offset, bool wp)
{
- return __copy_page(ufd, offset, false);
+ return __copy_page(ufd, offset, false, wp);
}
diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h
index f8d2ad178827..0ec07d025cfe 100644
--- a/tools/testing/selftests/mm/uffd-common.h
+++ b/tools/testing/selftests/mm/uffd-common.h
@@ -72,6 +72,8 @@
/* Userfaultfd test statistics */
struct uffd_args {
int cpu;
+ /* Whether apply wr-protects when installing pages */
+ bool apply_wp;
unsigned long missing_faults;
unsigned long wp_faults;
unsigned long minor_faults;
@@ -104,8 +106,8 @@ void 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);
void uffd_handle_page_fault(struct uffd_msg *msg, struct uffd_args *args);
-int __copy_page(int ufd, unsigned long offset, bool retry);
-int copy_page(int ufd, unsigned long offset);
+int __copy_page(int ufd, unsigned long offset, bool retry, bool wp);
+int copy_page(int ufd, unsigned long offset, bool wp);
void *uffd_poll_thread(void *arg);
#define TEST_ANON 1
diff --git a/tools/testing/selftests/mm/uffd-stress.c b/tools/testing/selftests/mm/uffd-stress.c
index ce7251ab93ef..747d588c0d69 100644
--- a/tools/testing/selftests/mm/uffd-stress.c
+++ b/tools/testing/selftests/mm/uffd-stress.c
@@ -96,6 +96,7 @@ static void uffd_stats_reset(struct uffd_args *args, unsigned long n_cpus)
for (i = 0; i < n_cpus; i++) {
args[i].cpu = i;
+ args[i].apply_wp = test_uffdio_wp;
args[i].missing_faults = 0;
args[i].wp_faults = 0;
args[i].minor_faults = 0;
@@ -155,7 +156,7 @@ static void *locking_thread(void *arg)
static int copy_page_retry(int ufd, unsigned long offset)
{
- return __copy_page(ufd, offset, true);
+ return __copy_page(ufd, offset, true, test_uffdio_wp);
}
pthread_mutex_t uffd_read_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -308,7 +309,7 @@ static void sighndl(int sig, siginfo_t *siginfo, void *ptr)
* This also tests UFFD_FEATURE_EVENT_FORK event along with the signal
* feature. Using monitor thread, verify no userfault events are generated.
*/
-static int faulting_process(int signal_test)
+static int faulting_process(int signal_test, bool wp)
{
unsigned long nr;
unsigned long long count;
@@ -343,7 +344,7 @@ static int faulting_process(int signal_test)
if (steps == 1) {
/* This is a MISSING request */
steps++;
- if (copy_page(uffd, offset))
+ if (copy_page(uffd, offset, wp))
signalled++;
} else {
/* This is a WP request */
@@ -507,6 +508,7 @@ static int userfaultfd_events_test(void)
true, test_uffdio_wp, false))
err("register failure");
+ args.apply_wp = test_uffdio_wp;
if (pthread_create(&uffd_mon, &attr, uffd_poll_thread, &args))
err("uffd_poll_thread create");
@@ -515,7 +517,7 @@ static int userfaultfd_events_test(void)
err("fork");
if (!pid)
- exit(faulting_process(0));
+ exit(faulting_process(0, test_uffdio_wp));
waitpid(pid, &err, 0);
if (err)
@@ -551,11 +553,12 @@ static int userfaultfd_sig_test(void)
true, test_uffdio_wp, false))
err("register failure");
- if (faulting_process(1))
+ if (faulting_process(1, test_uffdio_wp))
err("faulting process failed");
uffd_test_ops->release_pages(area_dst);
+ args.apply_wp = test_uffdio_wp;
if (pthread_create(&uffd_mon, &attr, uffd_poll_thread, &args))
err("uffd_poll_thread create");
@@ -564,7 +567,7 @@ static int userfaultfd_sig_test(void)
err("fork");
if (!pid)
- exit(faulting_process(2));
+ exit(faulting_process(2, test_uffdio_wp));
waitpid(pid, &err, 0);
if (err)
@@ -628,6 +631,7 @@ static int userfaultfd_minor_test(void)
page_size);
}
+ args.apply_wp = test_uffdio_wp;
if (pthread_create(&uffd_mon, &attr, uffd_poll_thread, &args))
err("uffd_poll_thread create");
--
2.39.1
next prev parent reply other threads:[~2023-04-12 16:43 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 16:38 [PATCH v2 00/31] selftests/mm: Split / Refactor userfault test Peter Xu
2023-04-12 16:38 ` [PATCH v2 01/31] Revert "userfaultfd: don't fail on unrecognized features" Peter Xu
2023-04-12 16:41 ` [PATCH v2 02/31] selftests/mm: Update .gitignore with two missing tests Peter Xu
2023-04-12 16:41 ` [PATCH v2 03/31] selftests/mm: Dump a summary in run_vmtests.sh Peter Xu
2023-04-12 16:41 ` [PATCH v2 04/31] selftests/mm: Merge util.h into vm_util.h Peter Xu
2023-04-12 16:42 ` [PATCH v2 05/31] selftests/mm: Use TEST_GEN_PROGS where proper Peter Xu
2023-04-15 15:44 ` Lorenzo Stoakes
2023-04-12 16:42 ` [PATCH v2 06/31] selftests/mm: Link vm_util.c always Peter Xu
2023-04-12 16:42 ` [PATCH v2 07/31] selftests/mm: Merge default_huge_page_size() into one Peter Xu
2023-04-12 16:42 ` [PATCH v2 08/31] selftests/mm: Use PM_* macros in vm_utils.h Peter Xu
2023-04-12 16:42 ` [PATCH v2 09/31] selftests/mm: Reuse pagemap_get_entry() in vm_util.h Peter Xu
2023-04-12 16:42 ` [PATCH v2 10/31] selftests/mm: Test UFFDIO_ZEROPAGE only when !hugetlb Peter Xu
2023-04-12 17:07 ` Axel Rasmussen
2023-04-12 16:42 ` [PATCH v2 11/31] selftests/mm: Drop test_uffdio_zeropage_eexist Peter Xu
2023-04-12 16:42 ` [PATCH v2 12/31] selftests/mm: Create uffd-common.[ch] Peter Xu
2023-04-12 17:59 ` Axel Rasmussen
2023-04-12 16:42 ` [PATCH v2 13/31] selftests/mm: Split uffd tests into uffd-stress and uffd-unit-tests Peter Xu
2023-04-12 18:03 ` Axel Rasmussen
2023-04-12 16:42 ` [PATCH v2 14/31] selftests/mm: uffd_[un]register() Peter Xu
2023-04-12 18:20 ` Axel Rasmussen
2023-04-12 19:33 ` Peter Xu
2023-04-12 16:42 ` [PATCH v2 15/31] selftests/mm: uffd_open_{dev|sys}() Peter Xu
2023-04-12 18:25 ` Axel Rasmussen
2023-04-12 16:42 ` [PATCH v2 16/31] selftests/mm: UFFDIO_API test Peter Xu
2023-04-12 19:47 ` Axel Rasmussen
2023-04-12 20:08 ` Peter Xu
2023-04-20 10:54 ` Mike Rapoport
2023-04-12 16:43 ` [PATCH v2 17/31] selftests/mm: Drop global mem_fd in uffd tests Peter Xu
2023-04-12 16:43 ` [PATCH v2 18/31] selftests/mm: Drop global hpage_size " Peter Xu
2023-04-12 16:43 ` [PATCH v2 19/31] selftests/mm: Rename uffd_stats to uffd_args Peter Xu
2023-04-20 10:55 ` Mike Rapoport
2023-04-12 16:43 ` Peter Xu [this message]
2023-04-12 16:43 ` [PATCH v2 21/31] selftests/mm: Allow allocate_area() to fail properly Peter Xu
2023-04-12 16:43 ` [PATCH v2 22/31] selftests/mm: Add framework for uffd-unit-test Peter Xu
2023-04-12 16:43 ` [PATCH v2 23/31] selftests/mm: Move uffd pagemap test to unit test Peter Xu
2023-04-12 16:43 ` [PATCH v2 24/31] selftests/mm: Move uffd minor " Peter Xu
2023-04-12 16:44 ` [PATCH v2 25/31] selftests/mm: Move uffd sig/events tests into uffd unit tests Peter Xu
2023-04-12 16:44 ` [PATCH v2 26/31] selftests/mm: Move zeropage test " Peter Xu
2023-04-12 16:45 ` [PATCH v2 27/31] selftests/mm: Workaround no way to detect uffd-minor + wp Peter Xu
2023-04-12 16:45 ` [PATCH v2 28/31] selftests/mm: Allow uffd test to skip properly with no privilege Peter Xu
2023-04-12 16:45 ` [PATCH v2 29/31] selftests/mm: Drop sys/dev test in uffd-stress test Peter Xu
2023-04-12 16:45 ` [PATCH v2 30/31] selftests/mm: Add shmem-private test to uffd-stress Peter Xu
2023-04-12 16:45 ` [PATCH v2 31/31] selftests/mm: Add uffdio register ioctls test Peter Xu
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=20230412164341.328618-1-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=axelrasmussen@google.com \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lsoaresp@redhat.com \
--cc=mike.kravetz@oracle.com \
--cc=nadav.amit@gmail.com \
--cc=rppt@linux.vnet.ibm.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).