tools-testing-selftests-mm-add-map_private-dev-zero-merge-tests.patch removed from -mm tree
The quilt patch titled
Subject: tools/testing/selftests/mm: add MAP_PRIVATE-/dev/zero merge tests
has been removed from the -mm tree. Its filename was
tools-testing-selftests-mm-add-map_private-dev-zero-merge-tests.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 (ARM)" <[email protected]>
Subject: tools/testing/selftests/mm: add MAP_PRIVATE-/dev/zero merge tests
Date: Sat, 26 Sep 2026 11:41:11 +0100
Assert that MAP_PRIVATE-mapped /dev/zero mappings behave like they are anonymous.
Test both unfaulted and faulted/unfaulted merges with page offset 0 which would not merge if the mappings were treated as if they were file-backed.
With the recent change that makes them behave as pure anonymous mappings, the merges should succeed as their page offsets are equal to their anonymous page offsets.
---
tools/testing/selftests/mm/merge.c | 95 +++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)
tools/testing/selftests/mm/merge.c renamed from tools/testing/selftests/mm/merge.c~tools-testing-selftests-mm-add-map_private-dev-zero-merge-tests +95 -0
@@ -1362,6 +1362,101 @@ TEST_F(merge, anon_and_page_offset_mismaASSERT_EQ (procmap->query.vma_end, (unsigned long )ptr +5 * page_size); } +TEST_F(merge, merge_map_private_dev_zero_unfaulted) +{ +struct procmap_fd *procmap = &self->procmap; +unsigned int page_size = self->page_size; +char *carveout = self->carveout; +char *ptr, *ptr2; +int fd_zero; + +if (access ("/dev/zero" ,F_OK )) +SKIP (return,"No /dev/zero." ); + fd_zero =open ("/dev/zero" ,O_RDWR ); +ASSERT_NE (fd_zero,-1 ); + +/* +* Map two MAP_PRIVATE-/dev/zero VMAs next to one another with offset 0 +* each. +* +* With these being made truly anonymous upon mapping, they will +* merge. If they were file-backed VMAs the page offsets would prevent +* the merge: +* +* |-----||------| |-------------| +* | ptr || ptr2 | -> | ptr | +* |-----||------| |-------------| +*/ + ptr =mmap (carveout,5 * page_size,PROT_READ |PROT_WRITE , +MAP_FIXED |MAP_PRIVATE , fd_zero,0 ); + ptr2 =mmap (&carveout[5 * page_size],5 * page_size, +PROT_READ |PROT_WRITE ,MAP_FIXED |MAP_PRIVATE , fd_zero,0 ); +close (fd_zero); +ASSERT_NE (ptr,MAP_FAILED ); +ASSERT_NE (ptr2,MAP_FAILED ); + +/* Assert that they merged. */ +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, merge_map_private_dev_zero_faulted_unfaulted) +{ +struct procmap_fd *procmap = &self->procmap; +unsigned int page_size = self->page_size; +char *carveout = self->carveout; +char *ptr, *ptr2; +int fd_zero; + +if (access ("/dev/zero" ,F_OK )) +SKIP (return,"No /dev/zero." ); + fd_zero =open ("/dev/zero" ,O_RDWR ); +ASSERT_NE (fd_zero,-1 ); + +/* +* Map a MAP_PRIVATE mapping of /dev/zero with page offset 0, then fault +* it in: +* +* |-------------------------------| +* | faulted | +* |-------------------------------| +*/ + ptr =mmap (carveout,15 * page_size,PROT_READ |PROT_WRITE , +MAP_FIXED |MAP_PRIVATE , fd_zero,0 ); +ASSERT_NE (ptr,MAP_FAILED ); +memset (ptr,'x' ,15 * page_size); + +/* +* Unmap the middle: +* +* |---------| |---------| +* | faulted | | faulted | +* |---------| |---------| +*/ +ASSERT_EQ (munmap (&ptr[5 * page_size],5 * page_size),0 ); + +/* +* Map in a new unfaulted mapping in the middle with page offset 0 - +* this should merge and would not if it were treated as a file rather +* than pure anon: +* +* |---------|-----------|---------| +* | faulted | unfaulted | faulted | +* |---------|-----------|---------| +*/ + ptr2 =mmap (&carveout[5 * page_size],5 * page_size, +PROT_READ |PROT_WRITE ,MAP_FIXED |MAP_PRIVATE , + fd_zero,0 ); +close (fd_zero); +ASSERT_NE (ptr2,MAP_FAILED ); + +/* Assert that they merged. */ +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 +15 * page_size); +} + TEST_F(merge_with_fork, mremap_faulted_to_unfaulted_prev) {struct procmap_fd *procmap = &self->procmap;
_
Patches currently in -mm which might be from [email protected] are
mm-vma-fix-mmap_prepare-file-handling-remove-file_doesnt_need_get.patch mm-vma-introduce-and-use-vma_can_merge.patch mm-consistently-validate-vma-state-after-mmap-hooks.patch mm-vma-ensure-mmap_prepare-doesnt-set-actions-on-a-mergeable-vma.patch mm-make-map_kernel_pages_-internal-and-unexported.patch mm-vma-tidy-up-map-kernel-pages-enum-values.patch mm-add-mmap-action-for-discontiguous-kernel-page-mapping.patch docs-filesystems-update-mmap_prepare-docs-for-discontig-kernel-pgs.patch drivers-usb-mon-update-to-use-mmap_prepare-map-kernel-pages.patch infiniband-update-hfi1-to-use-remap_vmalloc_range.patch selinux-reject-writable-opens-of-policy-file-drop-mmap-shared-write-check.patch alsa-pcm-use-vm_insert_page-to-map-pcm-status-page.patch bpf-arena-mark-arena_map_mmap-mappings-vm_mixedmap.patch mm-vma-add-vma_is_mm_managed-predicates.patch mm-vma-only-allow-mmap-to-clear-vma_maywrite_bit-if-not-mm-managed.patch mm-vma-add-and-use-vma__is_fixed_mapping.patch scsi-sg-convert-mmap-hook-to-mmap_prepare-and-rework.patch fbdev-defio-assert-fbinfo_virtfb-drop-vm_io-add-vm_mixedmap.patch hsi-cmt_speech-convert-mmap-hook-to-mmap_prepare-refactor.patch mm-gup-error-out-early-on-vma_mayread_bit-vmas.patch uprobes-remove-vm_io-set-vm_mixedmap-for-mapped-kernel-pages.patch mm-mlock-clear-vma_locked_mask-over-mmap-callback.patch mm-mlock-eliminate-weird-vma_io_bit-abuse-and-simplify.patch mm-vma-enforce-that-mm-managed-mappings-may-not-set-vma_io_bit.patch mm-remove-vma_io_bit-check-in-vma_is_mm_managed.patch mm-remove-hugetlb_inlineh.patch mm-rename-is_vm_hugetlb_page-to-vma_is_hugetlb.patch mm-drop-some-redundant-checks-around-hugetlb-vmas.patch mm-madvise-update-is_valid_guard_vma-to-use-vma_can_merge.patch mm-vma-introduce-vma_is_mm_backed.patch mm-uffd-use-predicates-for-userfaultfd-checks.patch mm-madvise-use-predicates-for-madvise-madv_dofork.patch mm-eliminate-vma_special_flags-usage-when-hugetlb-explicitly-tested.patch mm-eliminate-vma_special_flags-check-in-lru_gen_look_around.patch mm-avoid-use-of-vma_special_flags-in-migrate_vma_setup.patch mm-eliminate-vm_special-vma_special_flags.patch fuse-dax-do-not-set-vm_mixedmap.patch mm-huge_memory-remove-vma_is_special_huge.patch mm-vma-const-ify-vma_assert_stabilised-and-associated-functions.patch mm-implement-and-use-vma_has_anon_rmap-silence-kcsan.patch mm-update-comments-to-refer-to-anon-rmap-rather-than-anon_vma.patch mm-vma-dont-remove-vma-from-rmap-if-pgoff-unchanged.patch