| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230923013148.1390521-4-surenb@google.com>
Date: Fri, 22 Sep 2023 18:31:46 -0700
From: Suren Baghdasaryan <surenb@...gle.com>
To: akpm@...ux-foundation.org
Cc: viro@...iv.linux.org.uk, brauner@...nel.org, shuah@...nel.org,
aarcange@...hat.com, lokeshgidra@...gle.com, peterx@...hat.com,
david@...hat.com, hughd@...gle.com, mhocko@...e.com,
axelrasmussen@...gle.com, rppt@...nel.org, willy@...radead.org,
Liam.Howlett@...cle.com, jannh@...gle.com, zhangpeng362@...wei.com,
bgeffon@...gle.com, kaleshsingh@...gle.com, ngeoffray@...gle.com,
jdduke@...gle.com, surenb@...gle.com, linux-mm@...ck.org,
linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-kselftest@...r.kernel.org, kernel-team@...roid.com
Subject: [PATCH v2 3/3] selftests/mm: add UFFDIO_REMAP ioctl test
Add a test for new UFFDIO_REMAP ioctl which uses uffd to remaps source
into destination buffer while checking the contents of both after
remapping. After the operation the content of the destination buffer
should match the original source buffer's content while the source
buffer should be zeroed.
Signed-off-by: Suren Baghdasaryan <surenb@...gle.com>
---
tools/testing/selftests/mm/uffd-common.c | 41 ++++++++++++-
tools/testing/selftests/mm/uffd-common.h | 1 +
tools/testing/selftests/mm/uffd-unit-tests.c | 62 ++++++++++++++++++++
3 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/mm/uffd-common.c b/tools/testing/selftests/mm/uffd-common.c
index 02b89860e193..2a3ffd0ce96e 100644
--- a/tools/testing/selftests/mm/uffd-common.c
+++ b/tools/testing/selftests/mm/uffd-common.c
@@ -52,6 +52,13 @@ static int anon_allocate_area(void **alloc_area, bool is_src)
*alloc_area = NULL;
return -errno;
}
+
+ /* Prevent source pages from collapsing into THPs */
+ if (madvise(*alloc_area, nr_pages * page_size, MADV_NOHUGEPAGE)) {
+ *alloc_area = NULL;
+ return -errno;
+ }
+
return 0;
}
@@ -484,8 +491,14 @@ 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, args->apply_wp))
- args->missing_faults++;
+ /* UFFD_REMAP is supported for anon non-shared mappings. */
+ if (uffd_test_ops == &anon_uffd_test_ops && !map_shared) {
+ if (remap_page(uffd, offset))
+ args->missing_faults++;
+ } else {
+ if (copy_page(uffd, offset, args->apply_wp))
+ args->missing_faults++;
+ }
}
}
@@ -620,6 +633,30 @@ int copy_page(int ufd, unsigned long offset, bool wp)
return __copy_page(ufd, offset, false, wp);
}
+int remap_page(int ufd, unsigned long offset)
+{
+ struct uffdio_remap uffdio_remap;
+
+ if (offset >= nr_pages * page_size)
+ err("unexpected offset %lu\n", offset);
+ uffdio_remap.dst = (unsigned long) area_dst + offset;
+ uffdio_remap.src = (unsigned long) area_src + offset;
+ uffdio_remap.len = page_size;
+ uffdio_remap.mode = UFFDIO_REMAP_MODE_ALLOW_SRC_HOLES;
+ uffdio_remap.remap = 0;
+ if (ioctl(ufd, UFFDIO_REMAP, &uffdio_remap)) {
+ /* real retval in uffdio_remap.remap */
+ if (uffdio_remap.remap != -EEXIST)
+ err("UFFDIO_REMAP error: %"PRId64,
+ (int64_t)uffdio_remap.remap);
+ wake_range(ufd, uffdio_remap.dst, page_size);
+ } else if (uffdio_remap.remap != page_size) {
+ err("UFFDIO_REMAP error: %"PRId64, (int64_t)uffdio_remap.remap);
+ } else
+ return 1;
+ return 0;
+}
+
int uffd_open_dev(unsigned int flags)
{
int fd, uffd;
diff --git a/tools/testing/selftests/mm/uffd-common.h b/tools/testing/selftests/mm/uffd-common.h
index 7c4fa964c3b0..2bbb15d1920c 100644
--- a/tools/testing/selftests/mm/uffd-common.h
+++ b/tools/testing/selftests/mm/uffd-common.h
@@ -111,6 +111,7 @@ 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, bool wp);
int copy_page(int ufd, unsigned long offset, bool wp);
+int remap_page(int ufd, unsigned long offset);
void *uffd_poll_thread(void *arg);
int uffd_open_dev(unsigned int flags);
diff --git a/tools/testing/selftests/mm/uffd-unit-tests.c b/tools/testing/selftests/mm/uffd-unit-tests.c
index 2709a34a39c5..a33819639187 100644
--- a/tools/testing/selftests/mm/uffd-unit-tests.c
+++ b/tools/testing/selftests/mm/uffd-unit-tests.c
@@ -824,6 +824,10 @@ static void uffd_events_test_common(bool wp)
char c;
struct uffd_args args = { 0 };
+ /* Prevent source pages from being mapped more than once */
+ if (madvise(area_src, nr_pages * page_size, MADV_DONTFORK))
+ err("madvise(MADV_DONTFORK) failed");
+
fcntl(uffd, F_SETFL, uffd_flags | O_NONBLOCK);
if (uffd_register(uffd, area_dst, nr_pages * page_size,
true, wp, false))
@@ -1062,6 +1066,58 @@ static void uffd_poison_test(uffd_test_args_t *targs)
uffd_test_pass();
}
+static void uffd_remap_test(uffd_test_args_t *targs)
+{
+ unsigned long nr;
+ pthread_t uffd_mon;
+ char c;
+ unsigned long long count;
+ struct uffd_args args = { 0 };
+
+ if (uffd_register(uffd, area_dst, nr_pages * page_size,
+ true, false, false))
+ err("register failure");
+
+ if (pthread_create(&uffd_mon, NULL, uffd_poll_thread, &args))
+ err("uffd_poll_thread create");
+
+ /*
+ * Read each of the pages back using the UFFD-registered mapping. We
+ * expect that the first time we touch a page, it will result in a missing
+ * fault. uffd_poll_thread will resolve the fault by remapping source
+ * page to destination.
+ */
+ for (nr = 0; nr < nr_pages; nr++) {
+ /* Check area_src content */
+ count = *area_count(area_src, nr);
+ if (count != count_verify[nr])
+ err("nr %lu source memory invalid %llu %llu\n",
+ nr, count, count_verify[nr]);
+
+ /* Faulting into area_dst should remap the page */
+ count = *area_count(area_dst, nr);
+ if (count != count_verify[nr])
+ err("nr %lu memory corruption %llu %llu\n",
+ nr, count, count_verify[nr]);
+
+ /* Re-check area_src content which should be empty */
+ count = *area_count(area_src, nr);
+ if (count != 0)
+ err("nr %lu remap failed %llu %llu\n",
+ nr, count, count_verify[nr]);
+ }
+
+ if (write(pipefd[1], &c, sizeof(c)) != sizeof(c))
+ err("pipe write");
+ if (pthread_join(uffd_mon, NULL))
+ err("join() failed");
+
+ if (args.missing_faults != nr_pages || args.minor_faults != 0)
+ uffd_test_fail("stats check error");
+ else
+ uffd_test_pass();
+}
+
/*
* Test the returned uffdio_register.ioctls with different register modes.
* Note that _UFFDIO_ZEROPAGE is tested separately in the zeropage test.
@@ -1139,6 +1195,12 @@ uffd_test_case_t uffd_tests[] = {
.mem_targets = MEM_ALL,
.uffd_feature_required = 0,
},
+ {
+ .name = "remap",
+ .uffd_fn = uffd_remap_test,
+ .mem_targets = MEM_ANON,
+ .uffd_feature_required = 0,
+ },
{
.name = "wp-fork",
.uffd_fn = uffd_wp_fork_test,
--
2.42.0.515.g380fc7ccd1-goog
Powered by blists - more mailing lists