tools/testing/selftests: add merge test for partial msealed range
Subsystems (4)
Lorenzo Stoakes (Oracle)
maintainerPATCH v2 1/1 tools/testing/selftests: add merge test for partial msealed range
Commit 2697dd8ae721 ("mm/mseal: update VMA end correctly on merge") fixed an issue in the loop which iterates through VMAs applying mseal, which was triggered by mseal()'ing a range of VMAs where the second was mseal()'d and the first mergeable with it, once mseal()'d.
Add a regression test to assert that this behaviour is correct. We place it in the merge selftests as this is strictly an issue with merging (via a vma_modify() invocation).
It also assert that mseal()'d ranges are correctly merged as you'd expect.
The test is implemented such that it is skipped if mseal() is not available on the system.
---
v2:
* Added tools/ based header so __NR_mseal should always be available.
* However, for completeness, also check to see if defined, and assume ENOSYS if not.
* Thanks to Mike for reporting issues in his build on this test!
v1:
https://lore.kernel.org/all/[email protected]/
tools/testing/selftests/mm/merge.c | 89 ++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)
tools/testing/selftests/mm/merge.c +89 -0
@@ -2,6 +2,7 @@#define _GNU_SOURCE#include "kselftest_harness.h" +#include <asm-generic/unistd.h> #include <linux/prctl.h> #include <fcntl.h> #include <stdio.h>
@@ -48,6 +49,19 @@ static pid_t do_fork(struct procmap_fd *procmap)return 0 ; } +#ifdef __NR_mseal +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ +return syscall (__NR_mseal, (unsigned long )ptr, len, flags); +} +#else +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ + errno =ENOSYS ; +return -1 ; +} +#endif +FIXTURE_SETUP (merge) { self->page_size =psize ();
@@ -1217,6 +1231,81 @@ TEST_F(merge, mremap_correct_placed_faulted)ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +15 * page_size); } +TEST_F(merge, merge_vmas_with_mseal) +{ +unsigned int page_size = self->page_size; +struct procmap_fd *procmap = &self->procmap; +char *ptr, *ptr2, *ptr3; +/* We need our own as cannot munmap() once sealed. */ +char *carveout; + +/* Invalid mseal() call to see if implemented. */ +ASSERT_EQ (sys_mseal (NULL ,0 , ~0UL ),-1 ); +if (errno ==ENOSYS ) +SKIP (return,"mseal not supported, skipping." ); + +/* Map carveout. */ + carveout =mmap (NULL ,17 * page_size,PROT_NONE , +MAP_PRIVATE |MAP_ANON ,-1 ,0 ); +ASSERT_NE (carveout,MAP_FAILED ); + +/* +* Map 3 separate VMAs: +* +* |-----------|-----------|-----------| +* | RW | RWE | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ + ptr =mmap (&carveout[page_size],5 * page_size,PROT_READ |PROT_WRITE , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr,MAP_FAILED ); + ptr2 =mmap (&carveout[page_size *6 ],5 * page_size, +PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); + ptr3 =mmap (&carveout[page_size *11 ],5 * page_size,PROT_READ , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr3,MAP_FAILED ); + +/* +* mseal the second VMA: +* +* |-----------|-----------|-----------| +* | RW | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ +ASSERT_EQ (sys_mseal (ptr2,5 * page_size,0 ),0 ); + +/* Make first VMA mergeable upon mseal. */ +ASSERT_EQ (mprotect (ptr,5 * page_size, +PROT_READ |PROT_WRITE |PROT_EXEC ),0 ); +/* +* At this point we have: +* +* |-----------|-----------|-----------| +* | RWE | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +* +* Now mseal all of the VMAs. +*/ +ASSERT_EQ (sys_mseal (ptr,15 * page_size,0 ),0 ); + +/* +* We should end up with: +* +* |-----------------------|-----------| +* | RWES | ROS | +* |-----------------------|-----------| +* ptr ptr3 +*/ +ASSERT_TRUE (find_vma_procmap (procmap, ptr)); +ASSERT_EQ (procmap->query.vma_start, (unsigned long )ptr); +ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +10 * page_size); +} + TEST_F(merge_with_fork, mremap_faulted_to_unfaulted_prev) {struct procmap_fd *procmap = &self->procmap;
--
2.53.0
Quoted 70 lines · Lorenzo Stoakes (Oracle)
Commit
2697dd8ae721("mm/mseal: update VMA end correctly on merge") fixed an issue in the loop which iterates through VMAs applying mseal, which was triggered by mseal()'ing a range of VMAs where the second was mseal()'d and the first mergeable with it, once mseal()'d.Add a regression test to assert that this behaviour is correct. We place it in the merge selftests as this is strictly an issue with merging (via a
vma_modify()invocation).It also assert that mseal()'d ranges are correctly merged as you'd expect.
The test is implemented such that it is skipped if
mseal()is not available on the system.Signed-off-by Lorenzo Stoakes (Oracle) <[email protected]>---
v2:
* Addedtools/based header so__NR_msealshould always be available.
* However, for completeness, also check to see if defined, and assume ENOSYS if not.
* Thanks to Mike for reporting issues in his build on this test!v1:
https://lore.kernel.org/all/[email protected]/tools/testing/selftests/mm/merge.c | 89 ++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)tools/testing/selftests/mm/merge.c +20
-0@@ -2,6 +2,7 @@#define _GNU_SOURCE#include "kselftest_harness.h" +#include <asm-generic/unistd.h> #include <linux/prctl.h> #include <fcntl.h> #include <stdio.h> @@ -48,6 +49,19 @@ static pid_t do_fork(struct procmap_fd *procmap)return 0 ; } +#ifdef __NR_mseal +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ +return syscall (__NR_mseal, (unsigned long )ptr, len, flags); +} +#else +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ + errno =ENOSYS ; +return -1 ; +} +#endif +FIXTURE_SETUP (merge) { self->page_size =psize ();@@ -1217,6 +1231,81 @@ TEST_F(merge, mremap_correct_placed_faulted)ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +15 * page_size); } +TEST_F(merge, merge_vmas_with_mseal) +{ +unsigned int page_size = self->page_size; +struct procmap_fd *procmap = &self->procmap; +char *ptr, *ptr2, *ptr3; +/* We need our own as cannot munmap() once sealed. */
tools/testing/selftests/mm/merge.c TEST_F(merge, mremap_correct_placed_faulted) · line 1249
Quoted 10 lines
tools/testing/selftests/mm/merge.c +10
-0+char *carveout; + +/* Invalid mseal() call to see if implemented. */ +ASSERT_EQ (sys_mseal (NULL ,0 , ~0UL ),-1 ); +if (errno ==ENOSYS ) +SKIP (return,"mseal not supported, skipping." ); + +/* Map carveout. */ + carveout =mmap (NULL ,17 * page_size,PROT_NONE , +MAP_PRIVATE |MAP_ANON ,-1 ,0 );
I think it would be simpler if we did 5 pages (1 for each VMA, plus the two guard VMAs around it).
tools/testing/selftests/mm/merge.c TEST_F(merge, mremap_correct_placed_faulted) · line 1259
Quoted 10 lines
tools/testing/selftests/mm/merge.c +10
-0+ASSERT_NE (carveout,MAP_FAILED ); + +/* +* Map 3 separate VMAs: +* +* |-----------|-----------|-----------| +* | RW | RWE | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/
And now carveout += page_size; would leave us with
mmap(&carveout[0 * page_size])mmap(&carveout[1 * page_size])mmap(&carveout[2 * page_size])
and we don't need to deal with the arbitrary 5 pages below, which looks a good bit nicer.
Quoted 38 lines
tools/testing/selftests/mm/merge.c +38
-0+ ptr =mmap (&carveout[page_size],5 * page_size,PROT_READ |PROT_WRITE , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr,MAP_FAILED ); + ptr2 =mmap (&carveout[page_size *6 ],5 * page_size, +PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); + ptr3 =mmap (&carveout[page_size *11 ],5 * page_size,PROT_READ , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr3,MAP_FAILED ); + +/* +* mseal the second VMA: +* +* |-----------|-----------|-----------| +* | RW | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ +ASSERT_EQ (sys_mseal (ptr2,5 * page_size,0 ),0 ); + +/* Make first VMA mergeable upon mseal. */ +ASSERT_EQ (mprotect (ptr,5 * page_size, +PROT_READ |PROT_WRITE |PROT_EXEC ),0 ); +/* +* At this point we have: +* +* |-----------|-----------|-----------| +* | RWE | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +* +* Now mseal all of the VMAs. +*/ +ASSERT_EQ (sys_mseal (ptr,15 * page_size,0 ),0 ); + +/* +* We should end up with:
tools/testing/selftests/mm/merge.c TEST_F(merge, mremap_correct_placed_faulted) · line 1307
Quoted 10 lines
tools/testing/selftests/mm/merge.c +10
-0+* +* |-----------------------|-----------| +* | RWES | ROS | +* |-----------------------|-----------| +* ptr ptr3 +*/ +ASSERT_TRUE (find_vma_procmap (procmap, ptr)); +ASSERT_EQ (procmap->query.vma_start, (unsigned long )ptr); +ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +10 * page_size); +}
Apart from these nits, the test LGTM
Signature · 1 line
Pedro
Lorenzo Stoakes (Oracle)
maintainerQuoted 97 lines · Pedro Falcato
Quoted 70 lines · Lorenzo Stoakes (Oracle)
Commit
2697dd8ae721("mm/mseal: update VMA end correctly on merge") fixed an issue in the loop which iterates through VMAs applying mseal, which was triggered by mseal()'ing a range of VMAs where the second was mseal()'d and the first mergeable with it, once mseal()'d.Add a regression test to assert that this behaviour is correct. We place it in the merge selftests as this is strictly an issue with merging (via a
vma_modify()invocation).It also assert that mseal()'d ranges are correctly merged as you'd expect.
The test is implemented such that it is skipped if
mseal()is not available on the system.Signed-off-by Lorenzo Stoakes (Oracle) <[email protected]>---
v2:
* Addedtools/based header so__NR_msealshould always be available.
* However, for completeness, also check to see if defined, and assume ENOSYS if not.
* Thanks to Mike for reporting issues in his build on this test!v1:
https://lore.kernel.org/all/[email protected]/tools/testing/selftests/mm/merge.c | 89 ++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)tools/testing/selftests/mm/merge.c +20
-0@@ -2,6 +2,7 @@#define _GNU_SOURCE#include "kselftest_harness.h" +#include <asm-generic/unistd.h> #include <linux/prctl.h> #include <fcntl.h> #include <stdio.h> @@ -48,6 +49,19 @@ static pid_t do_fork(struct procmap_fd *procmap)return 0 ; } +#ifdef __NR_mseal +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ +return syscall (__NR_mseal, (unsigned long )ptr, len, flags); +} +#else +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ + errno =ENOSYS ; +return -1 ; +} +#endif +FIXTURE_SETUP (merge) { self->page_size =psize ();@@ -1217,6 +1231,81 @@ TEST_F(merge, mremap_correct_placed_faulted)ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +15 * page_size); } +TEST_F(merge, merge_vmas_with_mseal) +{ +unsigned int page_size = self->page_size; +struct procmap_fd *procmap = &self->procmap; +char *ptr, *ptr2, *ptr3; +/* We need our own as cannot munmap() once sealed. */ tools/testing/selftests/mm/merge.c TEST_F(merge, mremap_correct_placed_faulted) · line 1249
Quoted 10 lines
tools/testing/selftests/mm/merge.c +10
-0+char *carveout; + +/* Invalid mseal() call to see if implemented. */ +ASSERT_EQ (sys_mseal (NULL ,0 , ~0UL ),-1 ); +if (errno ==ENOSYS ) +SKIP (return,"mseal not supported, skipping." ); + +/* Map carveout. */ + carveout =mmap (NULL ,17 * page_size,PROT_NONE , +MAP_PRIVATE |MAP_ANON ,-1 ,0 );I think it would be simpler if we did 5 pages (1 for each VMA, plus the two guard VMAs around it).
tools/testing/selftests/mm/merge.c TEST_F(merge, mremap_correct_placed_faulted) · line 1259
Quoted 10 lines
tools/testing/selftests/mm/merge.c +10
-0+ASSERT_NE (carveout,MAP_FAILED ); + +/* +* Map 3 separate VMAs: +* +* |-----------|-----------|-----------| +* | RW | RWE | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ And now carveout +=
page_size; would leave us with
Quoted 5 lines
mmap(&carveout[0 * page_size])mmap(&carveout[1 * page_size])mmap(&carveout[2 * page_size])and we don't need to deal with the arbitrary 5 pages below, which looks a good bit nicer.
OK I mean I'm not sure I should be sending a v3 so fast and it's too much for a fix-patch.
Given it's cosmetic do we really care?
Quoted 52 lines
Quoted 39 lines
tools/testing/selftests/mm/merge.c +38
-0+ ptr =mmap (&carveout[page_size],5 * page_size,PROT_READ |PROT_WRITE , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr,MAP_FAILED ); + ptr2 =mmap (&carveout[page_size *6 ],5 * page_size, +PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); + ptr3 =mmap (&carveout[page_size *11 ],5 * page_size,PROT_READ , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr3,MAP_FAILED ); + +/* +* mseal the second VMA: +* +* |-----------|-----------|-----------| +* | RW | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ +ASSERT_EQ (sys_mseal (ptr2,5 * page_size,0 ),0 ); + +/* Make first VMA mergeable upon mseal. */ +ASSERT_EQ (mprotect (ptr,5 * page_size, +PROT_READ |PROT_WRITE |PROT_EXEC ),0 ); +/* +* At this point we have: +* +* |-----------|-----------|-----------| +* | RWE | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +* +* Now mseal all of the VMAs. +*/ +ASSERT_EQ (sys_mseal (ptr,15 * page_size,0 ),0 ); + +/* +* We should end up with: tools/testing/selftests/mm/merge.c TEST_F(merge, mremap_correct_placed_faulted) · line 1307
Quoted 10 lines
tools/testing/selftests/mm/merge.c +10
-0+* +* |-----------------------|-----------| +* | RWES | ROS | +* |-----------------------|-----------| +* ptr ptr3 +*/ +ASSERT_TRUE (find_vma_procmap (procmap, ptr)); +ASSERT_EQ (procmap->query.vma_start, (unsigned long )ptr); +ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +10 * page_size); +}Apart from these nits, the test LGTM
Quoted 1 line
Acked-by Pedro Falcato <[email protected]>
Thanks.
Quoted 3 lines
--
Pedro
Lorenzo Stoakes (Oracle)
maintainerThen again, and contradicting myself elsewhere on fix-patches blah blah blah, since this is just test code, I checked the below and it works the same and triggers the regression.
So maybe we can just apply that?
Cheers, Lorenzo
----8<----
From bcf5c7ea63961756913110694cfd34173e3f0fc4 Mon Sep 17 00:00:00 2001
From: "Lorenzo Stoakes (Oracle)" <[email protected]>
Date: Tue, 31 Mar 2026 11:01:35 +0100
Subject: [PATCH] fix
--- tools/testing/selftests/mm/merge.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
tools/testing/selftests/mm/merge.c +8 -8
@@ -1245,7 +1245,7 @@ TEST_F(merge, merge_vmas_with_mseal)SKIP (return,"mseal not supported, skipping." );/* Map carveout. */ - carveout =mmap (NULL ,17 * page_size,PROT_NONE , + carveout =mmap (NULL ,5 * page_size,PROT_NONE ,MAP_PRIVATE |MAP_ANON ,-1 ,0 );ASSERT_NE (carveout,MAP_FAILED );
@@ -1257,14 +1257,14 @@ TEST_F(merge, merge_vmas_with_mseal)* |-----------|-----------|-----------| * ptr ptr2 ptr3 */ - ptr =mmap (&carveout[page_size],5 * page_size,PROT_READ |PROT_WRITE , + ptr =mmap (&carveout[page_size], page_size,PROT_READ |PROT_WRITE ,MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 );ASSERT_NE (ptr,MAP_FAILED ); - ptr2 =mmap (&carveout[page_size *6 ],5 * page_size, + ptr2 =mmap (&carveout[2 * page_size], page_size,PROT_READ |PROT_WRITE |PROT_EXEC ,MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 );ASSERT_NE (ptr2,MAP_FAILED ); - ptr3 =mmap (&carveout[page_size *11 ],5 * page_size,PROT_READ , + ptr3 =mmap (&carveout[3 * page_size], page_size,PROT_READ ,MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 );ASSERT_NE (ptr3,MAP_FAILED );
@@ -1276,10 +1276,10 @@ TEST_F(merge, merge_vmas_with_mseal)* |-----------|-----------|-----------| * ptr ptr2 ptr3 */ -ASSERT_EQ (sys_mseal (ptr2,5 * page_size,0 ),0 ); +ASSERT_EQ (sys_mseal (ptr2, page_size,0 ),0 );/* Make first VMA mergeable upon mseal. */ -ASSERT_EQ (mprotect (ptr,5 * page_size, +ASSERT_EQ (mprotect (ptr, page_size,PROT_READ |PROT_WRITE |PROT_EXEC ),0 );/* * At this point we have:
@@ -1291,7 +1291,7 @@ TEST_F(merge, merge_vmas_with_mseal)* * Now mseal all of the VMAs. */ -ASSERT_EQ (sys_mseal (ptr,15 * page_size,0 ),0 ); +ASSERT_EQ (sys_mseal (ptr,3 * page_size,0 ),0 );/* * We should end up with:
@@ -1303,7 +1303,7 @@ TEST_F(merge, merge_vmas_with_mseal)*/ ASSERT_TRUE (find_vma_procmap (procmap, ptr));ASSERT_EQ (procmap->query.vma_start, (unsigned long )ptr); -ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +10 * page_size); +ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +2 * page_size); }TEST_F (merge_with_fork, mremap_faulted_to_unfaulted_prev)
--
2.53.0
Pedro Falcato
reviewerQuoted 3 lines · Lorenzo Stoakes (Oracle)
Then again, and contradicting myself elsewhere on fix-patches blah blah blah, since this is just test code, I checked the below and it works the same and triggers the regression.
Thanks for taking a look :)
Quoted 2 lines
So maybe we can just apply that?
If you also like it, SGTM. I was going to say you didn't need to (because it's test code, etc) but you were faster than me anyway :D
Signature · 1 line
Pedro
Andrew Morton
maintainerQuoted 5 lines · On Tue, 31 Mar 2026 11:08:03 +0100 "Lorenzo Stoakes (Oracle)" <[email protected]>…
Then again, and contradicting myself elsewhere on fix-patches blah blah blah, since this is just test code, I checked the below and it works the same and triggers the regression.
So maybe we can just apply that?
Here's how the two folded together will look:
From: "Lorenzo Stoakes (Oracle)" <[email protected]>
Subject: tools/testing/selftests: add merge test for partial msealed range
Date: Tue, 31 Mar 2026 08:36:27 +0100
Commit 2697dd8ae721 ("mm/mseal: update VMA end correctly on merge") fixed an issue in the loop which iterates through VMAs applying mseal, which was triggered by mseal()'ing a range of VMAs where the second was mseal()'d and the first mergeable with it, once mseal()'d.
Add a regression test to assert that this behaviour is correct. We place it in the merge selftests as this is strictly an issue with merging (via a vma_modify() invocation).
It also asserts that mseal()'d ranges are correctly merged as you'd expect.
The test is implemented such that it is skipped if mseal() is not available on the system.
---
tools/testing/selftests/mm/merge.c | 89 +++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)
tools/testing/selftests/mm/merge.c renamed from tools/testing/selftests/mm/merge.c~tools-testing-selftests-add-merge-test-for-partial-msealed-range +89 -0
@@ -2,6 +2,7 @@#define _GNU_SOURCE#include "kselftest_harness.h" +#include <asm-generic/unistd.h> #include <linux/prctl.h> #include <fcntl.h> #include <stdio.h>
@@ -48,6 +49,19 @@ static pid_t do_fork(struct procmap_fd *return 0 ; } +#ifdef __NR_mseal +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ +return syscall (__NR_mseal, (unsigned long )ptr, len, flags); +} +#else +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ + errno =ENOSYS ; +return -1 ; +} +#endif +FIXTURE_SETUP (merge) { self->page_size =psize ();
@@ -1217,6 +1231,81 @@ TEST_F(merge, mremap_correct_placed_faulASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +15 * page_size); } +TEST_F(merge, merge_vmas_with_mseal) +{ +unsigned int page_size = self->page_size; +struct procmap_fd *procmap = &self->procmap; +char *ptr, *ptr2, *ptr3; +/* We need our own as cannot munmap() once sealed. */ +char *carveout; + +/* Invalid mseal() call to see if implemented. */ +ASSERT_EQ (sys_mseal (NULL ,0 , ~0UL ),-1 ); +if (errno ==ENOSYS ) +SKIP (return,"mseal not supported, skipping." ); + +/* Map carveout. */ + carveout =mmap (NULL ,5 * page_size,PROT_NONE , +MAP_PRIVATE |MAP_ANON ,-1 ,0 ); +ASSERT_NE (carveout,MAP_FAILED ); + +/* +* Map 3 separate VMAs: +* +* |-----------|-----------|-----------| +* | RW | RWE | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ + ptr =mmap (&carveout[page_size], page_size,PROT_READ |PROT_WRITE , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr,MAP_FAILED ); + ptr2 =mmap (&carveout[2 * page_size], page_size, +PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); + ptr3 =mmap (&carveout[3 * page_size], page_size,PROT_READ , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr3,MAP_FAILED ); + +/* +* mseal the second VMA: +* +* |-----------|-----------|-----------| +* | RW | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ +ASSERT_EQ (sys_mseal (ptr2, page_size,0 ),0 ); + +/* Make first VMA mergeable upon mseal. */ +ASSERT_EQ (mprotect (ptr, page_size, +PROT_READ |PROT_WRITE |PROT_EXEC ),0 ); +/* +* At this point we have: +* +* |-----------|-----------|-----------| +* | RWE | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +* +* Now mseal all of the VMAs. +*/ +ASSERT_EQ (sys_mseal (ptr,3 * page_size,0 ),0 ); + +/* +* We should end up with: +* +* |-----------------------|-----------| +* | RWES | ROS | +* |-----------------------|-----------| +* ptr ptr3 +*/ +ASSERT_TRUE (find_vma_procmap (procmap, ptr)); +ASSERT_EQ (procmap->query.vma_start, (unsigned long )ptr); +ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +2 * page_size); +} + TEST_F(merge_with_fork, mremap_faulted_to_unfaulted_prev) {struct procmap_fd *procmap = &self->procmap;
_
Lorenzo Stoakes (Oracle)
maintainerQuoted 9 lines · Andrew Morton
Quoted 5 lines · On Tue, 31 Mar 2026 11:08:03 +0100 "Lorenzo Stoakes (Oracle)" <[email protected]>…
Then again, and contradicting myself elsewhere on fix-patches blah blah blah, since this is just test code, I checked the below and it works the same and triggers the regression.
So maybe we can just apply that?
Here's how the two folded together will look:
Thanks, LGTM!
Cheers, Lorenzo
Quoted 155 lines
From: "Lorenzo Stoakes (Oracle)" <[email protected]>
Subject:tools/testing/selftests: add merge test for partial msealed range
Date: Tue, 31 Mar 2026 08:36:27 +0100Commit
2697dd8ae721("mm/mseal: update VMA end correctly on merge") fixed an issue in the loop which iterates through VMAs applying mseal, which was triggered by mseal()'ing a range of VMAs where the second was mseal()'d and the first mergeable with it, once mseal()'d.Add a regression test to assert that this behaviour is correct. We place it in the merge selftests as this is strictly an issue with merging (via a
vma_modify()invocation).It also asserts that mseal()'d ranges are correctly merged as you'd expect.
The test is implemented such that it is skipped if
mseal()is not available on the system.[[email protected]: simplifications per Pedro]Signed-off-by Lorenzo Stoakes (Oracle) <[email protected]>Cc David Hildenbrand <[email protected]>Cc Jann Horn <[email protected]>Cc Liam Howlett <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Michal Hocko <[email protected]>Cc Mike Rapoport <[email protected]>Cc Pedro Falcato <[email protected]>Cc Shuah Khan <[email protected]>Cc Suren Baghdasaryan <[email protected]>Cc Vlastimil Babka <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
tools/testing/selftests/mm/merge.c | 89 +++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)tools/testing/selftests/mm/merge.c renamed from tools/testing/selftests/mm/merge.c~tools-testing-selftests-add-merge-test-for-partial-msealed-range +89
-0@@ -2,6 +2,7 @@#define _GNU_SOURCE#include "kselftest_harness.h" +#include <asm-generic/unistd.h> #include <linux/prctl.h> #include <fcntl.h> #include <stdio.h> @@ -48,6 +49,19 @@ static pid_t do_fork(struct procmap_fd *return 0 ; } +#ifdef __NR_mseal +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ +return syscall (__NR_mseal, (unsigned long )ptr, len, flags); +} +#else +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ + errno =ENOSYS ; +return -1 ; +} +#endif +FIXTURE_SETUP (merge) { self->page_size =psize ();@@ -1217,6 +1231,81 @@ TEST_F(merge, mremap_correct_placed_faulASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +15 * page_size); } +TEST_F(merge, merge_vmas_with_mseal) +{ +unsigned int page_size = self->page_size; +struct procmap_fd *procmap = &self->procmap; +char *ptr, *ptr2, *ptr3; +/* We need our own as cannot munmap() once sealed. */ +char *carveout; + +/* Invalid mseal() call to see if implemented. */ +ASSERT_EQ (sys_mseal (NULL ,0 , ~0UL ),-1 ); +if (errno ==ENOSYS ) +SKIP (return,"mseal not supported, skipping." ); + +/* Map carveout. */ + carveout =mmap (NULL ,5 * page_size,PROT_NONE , +MAP_PRIVATE |MAP_ANON ,-1 ,0 ); +ASSERT_NE (carveout,MAP_FAILED ); + +/* +* Map 3 separate VMAs: +* +* |-----------|-----------|-----------| +* | RW | RWE | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ + ptr =mmap (&carveout[page_size], page_size,PROT_READ |PROT_WRITE , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr,MAP_FAILED ); + ptr2 =mmap (&carveout[2 * page_size], page_size, +PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); + ptr3 =mmap (&carveout[3 * page_size], page_size,PROT_READ , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr3,MAP_FAILED ); + +/* +* mseal the second VMA: +* +* |-----------|-----------|-----------| +* | RW | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ +ASSERT_EQ (sys_mseal (ptr2, page_size,0 ),0 ); + +/* Make first VMA mergeable upon mseal. */ +ASSERT_EQ (mprotect (ptr, page_size, +PROT_READ |PROT_WRITE |PROT_EXEC ),0 ); +/* +* At this point we have: +* +* |-----------|-----------|-----------| +* | RWE | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +* +* Now mseal all of the VMAs. +*/ +ASSERT_EQ (sys_mseal (ptr,3 * page_size,0 ),0 ); + +/* +* We should end up with: +* +* |-----------------------|-----------| +* | RWES | ROS | +* |-----------------------|-----------| +* ptr ptr3 +*/ +ASSERT_TRUE (find_vma_procmap (procmap, ptr)); +ASSERT_EQ (procmap->query.vma_start, (unsigned long )ptr); +ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +2 * page_size); +} + TEST_F(merge_with_fork, mremap_faulted_to_unfaulted_prev) {struct procmap_fd *procmap = &self->procmap;_
Mike Rapoport
reviewerQuoted 14 lines · Lorenzo Stoakes (Oracle)
Commit
2697dd8ae721("mm/mseal: update VMA end correctly on merge") fixed an issue in the loop which iterates through VMAs applying mseal, which was triggered by mseal()'ing a range of VMAs where the second was mseal()'d and the first mergeable with it, once mseal()'d.Add a regression test to assert that this behaviour is correct. We place it in the merge selftests as this is strictly an issue with merging (via a
vma_modify()invocation).It also assert that mseal()'d ranges are correctly merged as you'd expect.
The test is implemented such that it is skipped if
mseal()is not available on the system.
Quoted 7 lines
Signed-off-by Lorenzo Stoakes (Oracle) <[email protected]>---
v2:
* Addedtools/based header so__NR_msealshould always be available.
* However, for completeness, also check to see if defined, and assume ENOSYS if not.
* Thanks to Mike for reporting issues in his build on this test!
Unfortunately it's not the only one :)
The header inclusion actually causes handle_uprobe_upon_merged_vma() to fail because of mismatch in definition of__NR_perf_event_open in <asm-generic/unistd.h> and the correct definition from /usr/include/unistd.h
With the patch below handle_uprobe_upon_merged_vma() passes again and I think it's not needed for mseal tests as well.
tools/testing/selftests/mm/merge.c +0 -1
@@ -2,7 +2,6 @@#define _GNU_SOURCE#include "kselftest_harness.h" -#include <asm-generic/unistd.h> #include <linux/prctl.h> #include <fcntl.h> #include <stdio.h>
Quoted 123 lines
v1:
https://lore.kernel.org/all/[email protected]/tools/testing/selftests/mm/merge.c | 89 ++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)tools/testing/selftests/mm/merge.c +89
-1@@ -2,6 +2,7 @@#define _GNU_SOURCE#include "kselftest_harness.h" +#include <asm-generic/unistd.h> #include <linux/prctl.h> #include <fcntl.h> #include <stdio.h> @@ -48,6 +49,19 @@ static pid_t do_fork(struct procmap_fd *procmap)return 0 ; } +#ifdef __NR_mseal +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ +return syscall (__NR_mseal, (unsigned long )ptr, len, flags); +} +#else +static int sys_mseal (void *ptr,size_t len,unsigned long flags) +{ + errno =ENOSYS ; +return -1 ; +} +#endif +FIXTURE_SETUP (merge) { self->page_size =psize ();@@ -1217,6 +1231,81 @@ TEST_F(merge, mremap_correct_placed_faulted)ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +15 * page_size); } +TEST_F(merge, merge_vmas_with_mseal) +{ +unsigned int page_size = self->page_size; +struct procmap_fd *procmap = &self->procmap; +char *ptr, *ptr2, *ptr3; +/* We need our own as cannot munmap() once sealed. */ +char *carveout; + +/* Invalid mseal() call to see if implemented. */ +ASSERT_EQ (sys_mseal (NULL ,0 , ~0UL ),-1 ); +if (errno ==ENOSYS ) +SKIP (return,"mseal not supported, skipping." ); + +/* Map carveout. */ + carveout =mmap (NULL ,17 * page_size,PROT_NONE , +MAP_PRIVATE |MAP_ANON ,-1 ,0 ); +ASSERT_NE (carveout,MAP_FAILED ); + +/* +* Map 3 separate VMAs: +* +* |-----------|-----------|-----------| +* | RW | RWE | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ + ptr =mmap (&carveout[page_size],5 * page_size,PROT_READ |PROT_WRITE , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr,MAP_FAILED ); + ptr2 =mmap (&carveout[page_size *6 ],5 * page_size, +PROT_READ |PROT_WRITE |PROT_EXEC , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); + ptr3 =mmap (&carveout[page_size *11 ],5 * page_size,PROT_READ , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr3,MAP_FAILED ); + +/* +* mseal the second VMA: +* +* |-----------|-----------|-----------| +* | RW | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +*/ +ASSERT_EQ (sys_mseal (ptr2,5 * page_size,0 ),0 ); + +/* Make first VMA mergeable upon mseal. */ +ASSERT_EQ (mprotect (ptr,5 * page_size, +PROT_READ |PROT_WRITE |PROT_EXEC ),0 ); +/* +* At this point we have: +* +* |-----------|-----------|-----------| +* | RWE | RWES | RO | +* |-----------|-----------|-----------| +* ptr ptr2 ptr3 +* +* Now mseal all of the VMAs. +*/ +ASSERT_EQ (sys_mseal (ptr,15 * page_size,0 ),0 ); + +/* +* We should end up with: +* +* |-----------------------|-----------| +* | RWES | ROS | +* |-----------------------|-----------| +* ptr ptr3 +*/ +ASSERT_TRUE (find_vma_procmap (procmap, ptr)); +ASSERT_EQ (procmap->query.vma_start, (unsigned long )ptr); +ASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +10 * page_size); +} + TEST_F(merge_with_fork, mremap_faulted_to_unfaulted_prev) {struct procmap_fd *procmap = &self->procmap; --2.53.0
Signature · 2 lines
Sincerely yours, Mike.
Lorenzo Stoakes (Oracle)
maintainerQuoted 23 lines · Mike Rapoport
Quoted 14 lines · Lorenzo Stoakes (Oracle)
Commit
2697dd8ae721("mm/mseal: update VMA end correctly on merge") fixed an issue in the loop which iterates through VMAs applying mseal, which was triggered by mseal()'ing a range of VMAs where the second was mseal()'d and the first mergeable with it, once mseal()'d.Add a regression test to assert that this behaviour is correct. We place it in the merge selftests as this is strictly an issue with merging (via a
vma_modify()invocation).It also assert that mseal()'d ranges are correctly merged as you'd expect.
The test is implemented such that it is skipped if
mseal()is not available on the system.Quoted 7 lines
Signed-off-by Lorenzo Stoakes (Oracle) <[email protected]>---
v2:
* Addedtools/based header so__NR_msealshould always be available.
* However, for completeness, also check to see if defined, and assume ENOSYS if not.
* Thanks to Mike for reporting issues in his build on this test!
Quoted 1 line
Unfortunately it's not the only one :)
Ugh...
Quoted 17 lines
The header inclusion actually causes
handle_uprobe_upon_merged_vma()to fail because of mismatch in definitionof__NR_perf_event_openin <asm-generic/unistd.h> and the correct definition from/usr/include/unistd.hWith the patch below
handle_uprobe_upon_merged_vma()passes again and I think it's not needed for mseal tests as well.tools/testing/selftests/mm/merge.c +0
-0
tools/testing/selftests/mm/merge.c line 7
Quoted 7 lines
tools/testing/selftests/mm/merge.c +0
-1@@ -2,7 +2,6 @@#define _GNU_SOURCE#include "kselftest_harness.h" -#include <asm-generic/unistd.h> #include <linux/prctl.h> #include <fcntl.h> #include <stdio.h>
Andrew - could you apply this two please? I can respin if needed.
Cheers, Lorenzo