From: jeffxu@chromium.org
To: akpm@linux-foundation.org
Cc: linux-kselftest@vger.kernel.org, linux-mm@kvack.org,
linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org,
pedro.falcato@gmail.com, willy@infradead.org,
lorenzo.stoakes@oracle.com, broonie@kernel.org, vbabka@suse.cz,
Liam.Howlett@oracle.com, rientjes@google.com,
keescook@chromium.org, Jeff Xu <jeffxu@chromium.org>
Subject: [PATCH v3 5/5] selftests/mseal: add more tests for mremap
Date: Fri, 30 Aug 2024 18:02:37 +0000 [thread overview]
Message-ID: <20240830180237.1220027-6-jeffxu@chromium.org> (raw)
In-Reply-To: <20240830180237.1220027-1-jeffxu@chromium.org>
From: Jeff Xu <jeffxu@chromium.org>
Add sealing test to cover mremap for
Expand/shrink/move across vmas.
Signed-off-by: Jeff Xu <jeffxu@chromium.org>
---
tools/testing/selftests/mm/mseal_test.c | 202 +++++++++++++++++++++++-
1 file changed, 201 insertions(+), 1 deletion(-)
diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selftests/mm/mseal_test.c
index 3516389034a7..fee655bbbf0a 100644
--- a/tools/testing/selftests/mm/mseal_test.c
+++ b/tools/testing/selftests/mm/mseal_test.c
@@ -2339,6 +2339,197 @@ static void test_seal_mmap_reuse_addr(bool seal)
REPORT_TEST_PASS();
}
+static void test_seal_mremap_shrink_multiple_vmas(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 12 * page_size;
+ int ret;
+ void *ret2;
+ int prot;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ ret = sys_mprotect(ptr + 4 * page_size, 4 * page_size, PROT_NONE);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ if (seal) {
+ ret = sys_mseal(ptr + 4 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+ }
+
+ ret2 = sys_mremap(ptr, 12 * page_size, 6 * page_size, 0, 0);
+ if (seal) {
+ FAIL_TEST_IF_FALSE(ret2 == (void *) MAP_FAILED);
+ FAIL_TEST_IF_FALSE(errno == EPERM);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ } else {
+ FAIL_TEST_IF_FALSE(ret2 == ptr);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 2 * page_size);
+ }
+
+ REPORT_TEST_PASS();
+}
+
+static void test_seal_mremap_expand_multiple_vmas(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 12 * page_size;
+ int ret;
+ void *ret2;
+ int prot;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ ret = sys_mprotect(ptr + 4 * page_size, 4 * page_size, PROT_NONE);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ /* ummap last 4 pages. */
+ ret = sys_munmap(ptr + 8 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ if (seal) {
+ ret = sys_mseal(ptr + 4 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+ }
+
+ ret2 = sys_mremap(ptr, 8 * page_size, 12 * page_size, 0, 0);
+ FAIL_TEST_IF_FALSE(ret2 == (void *) MAP_FAILED);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ REPORT_TEST_PASS();
+}
+
+static void test_seal_mremap_move_expand_multiple_vmas(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 12 * page_size;
+ int ret;
+ void *ret2;
+ int prot;
+ void *ptr2;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ setup_single_address(size, &ptr2);
+ FAIL_TEST_IF_FALSE(ptr2 != (void *)-1);
+
+ ret = sys_munmap(ptr2, 12 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ ret = sys_mprotect(ptr + 4 * page_size, 4 * page_size, PROT_NONE);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ /* ummap last 4 pages. */
+ ret = sys_munmap(ptr + 8 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ if (seal) {
+ ret = sys_mseal(ptr + 4 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+ }
+
+ /* move and expand cross VMA boundary will fail */
+ ret2 = sys_mremap(ptr, 8 * page_size, 10 * page_size, MREMAP_FIXED | MREMAP_MAYMOVE, ptr2);
+ FAIL_TEST_IF_FALSE(ret2 == (void *) MAP_FAILED);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+
+ REPORT_TEST_PASS();
+}
+
+static void test_seal_mremap_move_shrink_multiple_vmas(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 12 * page_size;
+ int ret;
+ void *ret2;
+ int prot;
+ void *ptr2;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ setup_single_address(size, &ptr2);
+ FAIL_TEST_IF_FALSE(ptr2 != (void *)-1);
+
+ ret = sys_munmap(ptr2, 12 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ ret = sys_mprotect(ptr + 4 * page_size, 4 * page_size, PROT_NONE);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 0);
+
+ if (seal) {
+ ret = sys_mseal(ptr + 4 * page_size, 4 * page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+ }
+
+ /* move and shrink cross VMA boundary is NOK */
+ ret2 = sys_mremap(ptr, 12 * page_size, 8 * page_size, MREMAP_FIXED | MREMAP_MAYMOVE, ptr2);
+ FAIL_TEST_IF_FALSE(ret2 == (void *) MAP_FAILED);
+
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 4 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 4 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 0);
+
+ REPORT_TEST_PASS();
+}
+
int main(int argc, char **argv)
{
bool test_seal = seal_support();
@@ -2360,7 +2551,7 @@ int main(int argc, char **argv)
if (!get_vma_size_supported())
ksft_exit_skip("get_vma_size not supported\n");
- ksft_set_plan(97);
+ ksft_set_plan(105);
test_seal_addseal();
test_seal_unmapped_start();
@@ -2481,5 +2672,14 @@ int main(int argc, char **argv)
test_seal_mmap_reuse_addr(false);
test_seal_mmap_reuse_addr(true);
+ test_seal_mremap_shrink_multiple_vmas(false);
+ test_seal_mremap_shrink_multiple_vmas(true);
+ test_seal_mremap_expand_multiple_vmas(false);
+ test_seal_mremap_expand_multiple_vmas(true);
+ test_seal_mremap_move_expand_multiple_vmas(false);
+ test_seal_mremap_move_expand_multiple_vmas(true);
+ test_seal_mremap_move_shrink_multiple_vmas(false);
+ test_seal_mremap_move_shrink_multiple_vmas(true);
+
ksft_finished();
}
--
2.46.0.469.g59c65b2a67-goog
next prev parent reply other threads:[~2024-08-30 18:03 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-30 18:02 [PATCH v3 0/5] Increase mseal test coverage jeffxu
2024-08-30 18:02 ` [PATCH v3 1/5] selftests/mseal_test: Check vma_size, prot, error code jeffxu
2024-08-30 18:02 ` [PATCH v3 2/5] selftests/mseal: add sealed madvise type jeffxu
2024-08-30 18:02 ` [PATCH v3 3/5] selftests/mseal: munmap across multiple vma ranges jeffxu
2024-08-30 18:02 ` [PATCH v3 4/5] selftests/mseal: add more tests for mmap jeffxu
2024-08-30 18:43 ` Lorenzo Stoakes
2024-08-30 19:22 ` Lorenzo Stoakes
2024-08-30 23:57 ` Jeff Xu
2024-09-07 19:27 ` Lorenzo Stoakes
2024-09-08 21:35 ` Pedro Falcato
2024-09-08 21:56 ` Pedro Falcato
2024-09-13 23:00 ` Jeff Xu
2024-09-13 23:00 ` Jeff Xu
2024-09-13 22:50 ` Jeff Xu
2024-09-18 13:18 ` Mark Brown
2024-09-20 16:37 ` Jeff Xu
2024-10-17 18:14 ` Jeff Xu
2024-10-17 18:28 ` Lorenzo Stoakes
2024-10-17 18:47 ` Jeff Xu
2024-10-17 19:00 ` Lorenzo Stoakes
2024-10-17 19:49 ` Jeff Xu
2024-10-18 6:37 ` Lorenzo Stoakes
2024-10-18 18:01 ` Jeff Xu
2024-10-18 20:51 ` Lorenzo Stoakes
2024-10-18 13:04 ` Mark Brown
2024-10-18 18:06 ` Jeff Xu
2024-10-18 18:37 ` Mark Brown
2024-10-18 19:32 ` Jeff Xu
2024-10-18 19:52 ` Lorenzo Stoakes
2024-10-18 20:28 ` Shuah Khan
2024-10-18 20:30 ` Shuah Khan
2024-10-18 21:05 ` Mark Brown
2024-10-19 0:10 ` Jeff Xu
2024-10-21 14:59 ` Mark Brown
2024-08-30 18:02 ` jeffxu [this message]
2024-08-30 19:17 ` [PATCH v3 0/5] Increase mseal test coverage Lorenzo Stoakes
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=20240830180237.1220027-6-jeffxu@chromium.org \
--to=jeffxu@chromium.org \
--cc=Liam.Howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=keescook@chromium.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lorenzo.stoakes@oracle.com \
--cc=pedro.falcato@gmail.com \
--cc=rientjes@google.com \
--cc=vbabka@suse.cz \
--cc=willy@infradead.org \
/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