tools-testing-add-expand-only-mode-vma-test.patch removed from -mm tree
The quilt patch titled
Subject: tools: testing: add expand-only mode VMA test
has been removed from the -mm tree. Its filename was
tools-testing-add-expand-only-mode-vma-test.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: tools: testing: add expand-only mode VMA test
Date: Thu, 17 Oct 2024 15:31:46 +0100
Add a test to assert that VMG_FLAG_JUST_EXPAND functions as expected - that is, when the VMA iterator is positioned at the previous VMA and no VMAs proceed it, we observe an expansion with all state as expected.
Explicitly place a prior VMA that would otherwise fail this test if the mode were not enabled (as it would traverse to the previous-previous VMA).
---
tools/testing/vma/vma.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
tools/testing/vma/vma.c renamed from tools/testing/vma/vma.c~tools-testing-add-expand-only-mode-vma-test +40 -0
@@ -1522,6 +1522,45 @@ static bool test_copy_vma(void)return true; } +static bool test_expand_only_mode (void ) +{ +unsigned long flags =VM_READ |VM_WRITE |VM_MAYREAD |VM_MAYWRITE ; +struct mm_struct mm = {}; +VMA_ITERATOR (vmi, &mm,0 ); +struct vm_area_struct *vma_prev, *vma; +VMG_STATE (vmg, &mm, &vmi,0x5000 ,0x9000 , flags,5 ); + +/* +* Place a VMA prior to the one we're expanding so we assert that we do +* not erroneously try to traverse to the previous VMA even though we +* have, through the use of VMG_FLAG_JUST_EXPAND, indicated we do not +* need to do so. +*/ +alloc_and_link_vma (&mm,0 ,0x2000 ,0 , flags); + +/* +* We will be positioned at the prev VMA, but looking to expand to +* 0x9000. +*/ +vma_iter_set (&vmi,0x3000 ); + vma_prev =alloc_and_link_vma (&mm,0x3000 ,0x5000 ,3 , flags); + vmg.prev = vma_prev; + vmg.merge_flags =VMG_FLAG_JUST_EXPAND ; + + vma =vma_merge_new_range (&vmg); +ASSERT_NE (vma,NULL ); +ASSERT_EQ (vma, vma_prev); +ASSERT_EQ (vmg.state,VMA_MERGE_SUCCESS ); +ASSERT_EQ (vma->vm_start,0x3000 ); +ASSERT_EQ (vma->vm_end,0x9000 ); +ASSERT_EQ (vma->vm_pgoff,3 ); +ASSERT_TRUE (vma_write_started (vma)); +ASSERT_EQ (vma_iter_addr (&vmi),0x3000 ); + +cleanup_mm (&mm, &vmi); +return true; +} +int main (void ) {int num_tests =0 , num_fail =0 ;
@@ -1553,6 +1592,7 @@ int main(void)TEST (vmi_prealloc_fail);TEST (merge_extend);TEST (copy_vma); +TEST (expand_only_mode);#undef TEST
_
Patches currently in -mm which might be from [email protected] are
mm-avoid-unsafe-vma-hook-invocation-when-error-arises-on-mmap-hook.patch mm-unconditionally-close-vmas-on-error.patch mm-refactor-map_deny_write_exec.patch mm-resolve-faulty-mmap_region-error-path-behaviour.patch selftests-mm-add-pkey_sighandler_xx-hugetlb_dio-to-gitignore.patch mm-refactor-mm_access-to-not-return-null.patch mm-refactor-mm_access-to-not-return-null-fix.patch mm-madvise-unrestrict-process_madvise-for-current-process.patch maple_tree-do-not-hash-pointers-on-dump-in-debug-mode.patch tools-testing-fix-phys_addr_t-size-on-64-bit-systems.patch tools-testing-fix-phys_addr_t-size-on-64-bit-systems-fix.patch tools-testing-add-additional-vma_internalh-stubs.patch mm-isolate-mmap-internal-logic-to-mm-vmac.patch mm-refactor-__mmap_region.patch mm-defer-second-attempt-at-merge-on-mmap.patch mm-pagewalk-add-the-ability-to-install-ptes.patch mm-add-pte_marker_guard-pte-marker.patch mm-madvise-implement-lightweight-guard-page-mechanism.patch tools-testing-update-tools-uapi-header-for-mman-commonh.patch selftests-mm-add-self-tests-for-guard-page-feature.patch