tools-testing-selftests-add-vma-merge-tests-for-ksm-merge.patch removed from -mm tree
The quilt patch titled
Subject: tools/testing/selftests: add VMA merge tests for KSM merge
has been removed from the -mm tree. Its filename was
tools-testing-selftests-add-vma-merge-tests-for-ksm-merge.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: add VMA merge tests for KSM merge
Date: Thu, 29 May 2025 18:15:48 +0100
Add test to assert that we have now allowed merging of VMAs when KSM merging-by-default has been set by prctl(PR_SET_MEMORY_MERGE, ...).
We simply perform a trivial mapping of adjacent VMAs expecting a merge, however prior to recent changes implementing this mode earlier than before, these merges would not have succeeded.
Assert that we have fixed this!
---
tools/testing/selftests/mm/merge.c | 78 +++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)
tools/testing/selftests/mm/merge.c renamed from tools/testing/selftests/mm/merge.c~tools-testing-selftests-add-vma-merge-tests-for-ksm-merge +78 -0
@@ -2,11 +2,13 @@#define _GNU_SOURCE#include "../kselftest_harness.h" +#include <linux/prctl.h> #include <fcntl.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> #include <sys/mman.h> +#include <sys/prctl.h> #include <sys/syscall.h> #include <sys/wait.h> #include <linux/perf_event.h>
@@ -34,6 +36,11 @@ FIXTURE_TEARDOWN(merge) {ASSERT_EQ (munmap (self->carveout,12 * self->page_size),0 );ASSERT_EQ (close_procmap (&self->procmap),0 ); +/* +* Clear unconditionally, as some tests set this. It is no issue if this +* fails (KSM may be disabled for instance). +*/ +prctl (PR_SET_MEMORY_MERGE ,0 ,0 ,0 ,0 ); }TEST_F (merge, mprotect_unfaulted_left)
@@ -498,4 +505,75 @@ out:remove (probe_file); } +TEST_F(merge, ksm_merge) +{ +unsigned int page_size = self->page_size; +char *carveout = self->carveout; +struct procmap_fd *procmap = &self->procmap; +char *ptr, *ptr2; +int err; + +/* +* Map two R/W immediately adjacent to one another, they should +* trivially merge: +* +* |-----------|-----------| +* | R/W | R/W | +* |-----------|-----------| +* ptr ptr2 +*/ + + 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 , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); +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); + +/* Unmap the second half of this merged VMA. */ +ASSERT_EQ (munmap (ptr2, page_size),0 ); + +/* OK, now enable global KSM merge. We clear this on test teardown. */ + err =prctl (PR_SET_MEMORY_MERGE ,1 ,0 ,0 ,0 ); +if (err ==-1 ) { +int errnum = errno; + +/* Only non-failure case... */ +ASSERT_EQ (errnum,EINVAL ); +/* ...but indicates we should skip. */ +SKIP (return,"KSM memory merging not supported, skipping." ); + } + +/* +* Now map a VMA adjacent to the existing that was just made +* VM_MERGEABLE, this should merge as well. +*/ + ptr2 =mmap (&carveout[2 * page_size], page_size, +PROT_READ |PROT_WRITE , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); +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); + +/* Now this VMA altogether. */ +ASSERT_EQ (munmap (ptr,2 * page_size),0 ); + +/* Try the same operation as before, asserting this also merges fine. */ + 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 , +MAP_ANON |MAP_PRIVATE |MAP_FIXED ,-1 ,0 ); +ASSERT_NE (ptr2,MAP_FAILED ); +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_HARNESS_MAIN
_
Patches currently in -mm which might be from [email protected] are
mm-madvise-remove-the-visitor-pattern-and-thread-anon_vma-state.patch mm-madvise-thread-mm_struct-through-madvise_behavior.patch mm-madvise-thread-vma-range-state-through-madvise_behavior.patch mm-madvise-thread-all-madvise-state-through-madv_behavior.patch mm-madvise-eliminate-very-confusing-manipulation-of-prev-vma.patch mm-madvise-eliminate-very-confusing-manipulation-of-prev-vma-fix.patch tools-testing-selftests-add-mremap-unfaulted-faulted-test-cases.patch mm-mremap-perform-some-simple-cleanups.patch mm-mremap-refactor-initial-parameter-sanity-checks.patch mm-mremap-put-vma-check-and-prep-logic-into-helper-function.patch mm-mremap-cleanup-post-processing-stage-of-mremap.patch mm-mremap-use-an-explicit-uffd-failure-path-for-mremap.patch mm-mremap-use-an-explicit-uffd-failure-path-for-mremap-fix.patch mm-mremap-check-remap-conditions-earlier.patch mm-mremap-move-remap_is_valid-into-check_prep_vma.patch mm-mremap-clean-up-mlock-populate-behaviour.patch mm-mremap-permit-mremap-move-of-multiple-vmas.patch tools-testing-selftests-extend-mremap_test-to-test-multi-vma-mremap.patch