tools-testing-selftests-test-mremap_dontunmap-on-multiple-vma-move.patch removed from -mm tree
The quilt patch titled
Subject: tools/testing/selftests: test MREMAP_DONTUNMAP on multiple VMA move
has been removed from the -mm tree. Its filename was
tools-testing-selftests-test-mremap_dontunmap-on-multiple-vma-move.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: tools/testing/selftests: test MREMAP_DONTUNMAP on multiple VMA move
Date: Mon, 21 Jul 2025 18:33:26 +0100
We support MREMAP_MAYMOVE | MREMAP_FIXED | MREMAP_DONTUNMAP for moving multiple VMAs via mremap(), so assert that the tests pass with both MREMAP_DONTUNMAP set and not set.
Additionally, add success = false settings when mremap() fails. This is something that cannot realistically happen, so in no way impacted test outcome, but it is incorrect to indicate a test pass when something has failed.
---
tools/testing/selftests/mm/mremap_test.c | 29 +++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-)
tools/testing/selftests/mm/mremap_test.c renamed from tools/testing/selftests/mm/mremap_test.c~tools-testing-selftests-test-mremap_dontunmap-on-multiple-vma-move +19 -10
@@ -406,14 +406,19 @@ static bool is_multiple_vma_range_ok(uns }static void mremap_move_multiple_vmas (unsigned int pattern_seed, -unsigned long page_size) +unsigned long page_size, +bool dont_unmap) { +int mremap_flags =MREMAP_FIXED |MREMAP_MAYMOVE ;char *test_name ="mremap move multiple vmas" ;const size_t size =11 * page_size;bool success = true;char *ptr, *tgt_ptr;int i; +if (dont_unmap) + mremap_flags |=MREMAP_DONTUNMAP ; + ptr =mmap (NULL , size,PROT_READ |PROT_WRITE ,MAP_PRIVATE |MAP_ANON ,-1 ,0 );if (ptr ==MAP_FAILED ) {
@@ -467,8 +472,7 @@ static void mremap_move_multiple_vmas(un }/* First, just move the whole thing. */ -if (mremap (ptr, size, size, -MREMAP_MAYMOVE |MREMAP_FIXED , tgt_ptr) ==MAP_FAILED ) { +if (mremap (ptr, size, size, mremap_flags, tgt_ptr) ==MAP_FAILED ) {perror ("mremap" ); success = false; goto out_unmap;
@@ -480,9 +484,10 @@ static void mremap_move_multiple_vmas(un }/* Move next to itself. */ -if (mremap (tgt_ptr, size, size, -MREMAP_MAYMOVE |MREMAP_FIXED , &tgt_ptr[size]) ==MAP_FAILED ) { +if (mremap (tgt_ptr, size, size, mremap_flags, + &tgt_ptr[size]) ==MAP_FAILED ) {perror ("mremap" ); + success = false; goto out_unmap; }/* Check that the move is ok. */
@@ -500,8 +505,9 @@ static void mremap_move_multiple_vmas(un }/* Move and overwrite. */ if (mremap (&tgt_ptr[size], size, size, -MREMAP_MAYMOVE |MREMAP_FIXED , tgt_ptr) ==MAP_FAILED ) { + mremap_flags, tgt_ptr) ==MAP_FAILED ) {perror ("mremap" ); + success = false; goto out_unmap; }/* Check that the move is ok. */
@@ -518,9 +524,11 @@ out_unmap: out:if (success) -ksft_test_result_pass ("%s\n" , test_name); +ksft_test_result_pass ("%s%s\n" , test_name, + dont_unmap ?" [dontunnmap]" :"" );else -ksft_test_result_fail ("%s\n" , test_name); +ksft_test_result_fail ("%s%s\n" , test_name, + dont_unmap ?" [dontunnmap]" :"" ); } static void mremap_shrink_multiple_vmas(unsigned long page_size,
@@ -943,7 +951,7 @@ int main(int argc, char **argv)char *rand_addr;size_t rand_size;int num_expand_tests =2 ; -int num_misc_tests =5 ; +int num_misc_tests =6 ;struct test test_cases[MAX_TEST ] = {};struct test perf_test_cases[MAX_PERF_TEST ];int page_size;
@@ -1070,9 +1078,10 @@ int main(int argc, char **argv)mremap_move_within_range (pattern_seed, rand_addr);mremap_move_1mb_from_start (pattern_seed, rand_addr); -mremap_move_multiple_vmas (pattern_seed, page_size);mremap_shrink_multiple_vmas (page_size,/* inplace= */ true);mremap_shrink_multiple_vmas (page_size,/* inplace= */ false); +mremap_move_multiple_vmas (pattern_seed, page_size,/* dontunmap= */ false); +mremap_move_multiple_vmas (pattern_seed, page_size,/* dontunmap= */ true);if (run_perf_tests) { ksft_print_msg("\n%s\n",
_
Patches currently in -mm which might be from [email protected] are
mm-mseal-always-define-vm_sealed.patch mm-mseal-update-madvise-logic.patch mm-mseal-small-cleanups.patch mm-mseal-simplify-and-rename-vma-gap-check.patch mm-mseal-rework-mseal-apply-logic.patch maintainers-add-missing-percpu-internalh-file-to-per-cpu-section.patch maintainers-add-missing-interval_treec-to-memory-mapping-section.patch maintainers-add-missing-mm_sloth-file-thp-section.patch maintainers-add-missing-mm_sloth-file-thp-section-fix.patch maintainers-move-memremap-to-hotplug-section.patch maintainers-add-missing-shrinker-files.patch maintainers-add-missing-files-to-page-alloc-section.patch maintainers-add-missing-zsmalloc-file.patch maintainers-add-mm-misc-section-add-missing-files-to-misc-and-core.patch maintainers-add-missing-file-to-cgroup-section.patch