* + tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch added to mm-new branch
@ 2026-04-01 0:57 Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2026-04-01 0:57 UTC (permalink / raw)
To: mm-commits, vbabka, surenb, shuah, rppt, pfalcato, mhocko,
liam.howlett, jannh, david, ljs, akpm
The patch titled
Subject: tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix
has been added to the -mm mm-new branch. Its filename is
tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch
This patch will later appear in the mm-new branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Note, mm-new is a provisional staging ground for work-in-progress
patches, and acceptance into mm-new is a notification for others take
notice and to finish up reviews. Please do not hesitate to respond to
review feedback and post updated versions to replace or incrementally
fixup patches in mm-new.
The mm-new branch of mm.git is not included in linux-next
If a few days of testing in mm-new is successful, the patch will me moved
into mm.git's mm-unstable branch, which is included in linux-next
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days
------------------------------------------------------
From: "Lorenzo Stoakes (Oracle)" <ljs@kernel.org>
Subject: tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix
Date: Tue, 31 Mar 2026 11:01:35 +0100
simplifications per Pedro
Link: https://lkml.kernel.org/r/1c9c922d-5cb5-4cff-9273-b737cdb57ca1@lucifer.local
Signed-off-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Jann Horn <jannh@google.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Pedro Falcato <pfalcato@suse.de>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
tools/testing/selftests/mm/merge.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/tools/testing/selftests/mm/merge.c~tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix
+++ a/tools/testing/selftests/mm/merge.c
@@ -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)
_
Patches currently in -mm which might be from ljs@kernel.org are
mm-khugepaged-fix-issue-with-tracking-lock.patch
maintainers-update-mglru-entry-to-reflect-current-status.patch
tools-testing-selftests-add-merge-test-for-partial-msealed-range.patch
tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
* + tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch added to mm-new branch
@ 2026-04-01 1:00 Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2026-04-01 1:00 UTC (permalink / raw)
To: mm-commits, vbabka, surenb, shuah, rppt, pfalcato, mhocko,
liam.howlett, jannh, david, ljs, akpm
The patch titled
Subject: tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix
has been added to the -mm mm-new branch. Its filename is
tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch
This patch will later appear in the mm-new branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Note, mm-new is a provisional staging ground for work-in-progress
patches, and acceptance into mm-new is a notification for others take
notice and to finish up reviews. Please do not hesitate to respond to
review feedback and post updated versions to replace or incrementally
fixup patches in mm-new.
The mm-new branch of mm.git is not included in linux-next
If a few days of testing in mm-new is successful, the patch will me moved
into mm.git's mm-unstable branch, which is included in linux-next
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via various
branches at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there most days
------------------------------------------------------
From: "Lorenzo Stoakes (Oracle)" <ljs@kernel.org>
Subject: tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix
Date: Tue, 31 Mar 2026 11:01:35 +0100
simplifications per Pedro
Link: https://lkml.kernel.org/r/1c9c922d-5cb5-4cff-9273-b737cdb57ca1@lucifer.local
Signed-off-by: Lorenzo Stoakes (Oracle) <ljs@kernel.org>
Cc: David Hildenbrand <david@kernel.org>
Cc: Jann Horn <jannh@google.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Pedro Falcato <pfalcato@suse.de>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
tools/testing/selftests/mm/merge.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
--- a/tools/testing/selftests/mm/merge.c~tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix
+++ a/tools/testing/selftests/mm/merge.c
@@ -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)
_
Patches currently in -mm which might be from ljs@kernel.org are
mm-khugepaged-fix-issue-with-tracking-lock.patch
maintainers-update-mglru-entry-to-reflect-current-status.patch
tools-testing-selftests-add-merge-test-for-partial-msealed-range.patch
tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-04-01 1:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-01 1:00 + tools-testing-selftests-add-merge-test-for-partial-msealed-range-fix.patch added to mm-new branch Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2026-04-01 0:57 Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox