mm-perform-vma-allocation-freeing-duplication-in-mm.patch removed from -mm tree
The quilt patch titled
Subject: mm: perform VMA allocation, freeing, duplication in mm
has been removed from the -mm tree. Its filename was
mm-perform-vma-allocation-freeing-duplication-in-mm.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: mm: perform VMA allocation, freeing, duplication in mm
Date: Mon, 28 Apr 2025 16:28:17 +0100
Right now these are performed in kernel/fork.c which is odd and a violation of separation of concerns, as well as preventing us from integrating this and related logic into userland VMA testing going forward.
There is a fly in the ointment - nommu - mmap.c is not compiled if CONFIG_MMU not set, and neither is vma.c.
To square the circle, let's add a new file - vma_init.c. This will be compiled for both CONFIG_MMU and nommu builds, and will also form part of the VMA userland testing.
This allows us to de-duplicate code, while maintaining separation of concerns and the ability for us to userland test this logic.
Update the VMA userland tests accordingly, additionally adding a detach_free_vma() helper function to correctly detach VMAs before freeing them in test code, as this change was triggering the assert for this.
---
MAINTAINERS | 1 kernel/fork.c | 88 ----------------- mm/Makefile | 2 mm/mmap.c | 3 mm/nommu.c | 4 mm/vma.h | 6 + mm/vma_init.c | 101 ++++++++++++++++++++ tools/testing/vma/Makefile | 2 tools/testing/vma/vma.c | 26 +++-- tools/testing/vma/vma_internal.h | 143 +++++++++++++++++++++++------ 10 files changed, 250 insertions(+), 126 deletions(-)
kernel/fork.c renamed from kernel/fork.c~mm-perform-vma-allocation-freeing-duplication-in-mm +0 -88
@@ -431,88 +431,9 @@ struct kmem_cache *files_cachep;/* SLAB cache for fs_struct structures (tsk->fs) */ struct kmem_cache *fs_cachep; -/* SLAB cache for vm_area_struct structures */ -static struct kmem_cache *vm_area_cachep; -/* SLAB cache for mm_struct structures (tsk->mm) */ static struct kmem_cache *mm_cachep; -struct vm_area_struct *vm_area_alloc (struct mm_struct *mm) -{ -struct vm_area_struct *vma; - - vma =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL ); -if (!vma) -return NULL ; - -vma_init (vma, mm); - -return vma; -} - -static void vm_area_init_from (const struct vm_area_struct *src, -struct vm_area_struct *dest) -{ - dest->vm_mm = src->vm_mm; - dest->vm_ops = src->vm_ops; - dest->vm_start = src->vm_start; - dest->vm_end = src->vm_end; - dest->anon_vma = src->anon_vma; - dest->vm_pgoff = src->vm_pgoff; - dest->vm_file = src->vm_file; - dest->vm_private_data = src->vm_private_data; -vm_flags_init (dest, src->vm_flags); -memcpy (&dest->vm_page_prot, &src->vm_page_prot, -sizeof (dest->vm_page_prot)); -/* -* src->shared.rb may be modified concurrently when called from -* dup_mmap(), but the clone will reinitialize it. -*/ -data_race (memcpy (&dest->shared, &src->shared,sizeof (dest->shared))); -memcpy (&dest->vm_userfaultfd_ctx, &src->vm_userfaultfd_ctx, -sizeof (dest->vm_userfaultfd_ctx)); -#ifdef CONFIG_ANON_VMA_NAME - dest->anon_name = src->anon_name; -#endif -#ifdef CONFIG_SWAP -memcpy (&dest->swap_readahead_info, &src->swap_readahead_info, -sizeof (dest->swap_readahead_info)); -#endif -#ifndef CONFIG_MMU - dest->vm_region = src->vm_region; -#endif -#ifdef CONFIG_NUMA - dest->vm_policy = src->vm_policy; -#endif -} - -struct vm_area_struct *vm_area_dup (struct vm_area_struct *orig) -{ -struct vm_area_struct *new =kmem_cache_alloc (vm_area_cachep,GFP_KERNEL ); - -if (!new) -return NULL ; - -ASSERT_EXCLUSIVE_WRITER (orig->vm_flags); -ASSERT_EXCLUSIVE_WRITER (orig->vm_file); -vm_area_init_from (orig, new); -vma_lock_init (new, true); -INIT_LIST_HEAD (&new->anon_vma_chain); -vma_numab_state_init (new); -dup_anon_vma_name (orig, new); - -return new; -} - -void vm_area_free (struct vm_area_struct *vma) -{ -/* The vma should be detached while being destroyed. */ -vma_assert_detached (vma); -vma_numab_state_free (vma); -free_anon_vma_name (vma); -kmem_cache_free (vm_area_cachep, vma); -} -static void account_kernel_stack (struct task_struct *tsk,int account) {if (IS_ENABLED (CONFIG_VMAP_STACK )) {
@@ -3033,11 +2954,6 @@ void __init mm_cache_init(void)void __init proc_caches_init (void ) { -struct kmem_cache_args args = { - .use_freeptr_offset = true, - .freeptr_offset = offsetof(struct vm_area_struct , vm_freeptr), - }; - sighand_cachep = kmem_cache_create("sighand_cache", sizeof(struct sighand_struct), 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_TYPESAFE_BY_RCU|
@@ -3054,10 +2970,6 @@ void __init proc_caches_init(void)sizeof (struct fs_struct ),0 ,SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_ACCOUNT , NULL); - vm_area_cachep =kmem_cache_create ("vm_area_struct" , -sizeof (struct vm_area_struct ), &args, -SLAB_HWCACHE_ALIGN |SLAB_PANIC |SLAB_TYPESAFE_BY_RCU | -SLAB_ACCOUNT );mmap_init ();nsproxy_cache_init (); }
MAINTAINERS renamed from MAINTAINERS~mm-perform-vma-allocation-freeing-duplication-in-mm +1 -0
@@ -15683,6 +15683,7 @@ F: mm/mseal.c F: mm/vma.c F: mm/vma.h F: mm/vma_exec.c +F: mm/vma_init.c F: mm/vma_internal.h F: tools/testing/selftests/mm/merge.c F: tools/testing/vma/
mm/Makefile renamed from mm/Makefile~mm-perform-vma-allocation-freeing-duplication-in-mm +1 -1
@@ -55,7 +55,7 @@ obj-y := filemap.o mempool.o oom_kill. mm_init.o percpu.o slab_common.o \ compaction.o show_mem.o \ interval_tree.o list_lru.o workingset.o \ - debug.o gup.o mmap_lock.o $(mmu-y) + debug.o gup.o mmap_lock.o vma_init.o $(mmu-y) # Give 'page_alloc' its own module-parameter namespace page-alloc-y := page_alloc.o
mm/mmap.c renamed from mm/mmap.c~mm-perform-vma-allocation-freeing-duplication-in-mm +2 -1
@@ -1554,7 +1554,7 @@ static const struct ctl_table mmap_table#endif /* CONFIG_SYSCTL */ /* -* initialise the percpu counter for VM +* initialise the percpu counter for VM, initialise VMA state. */ void __init mmap_init (void ) {
@@ -1565,6 +1565,7 @@ void __init mmap_init(void)#ifdef CONFIG_SYSCTL register_sysctl_init ("vm" , mmap_table);#endif +vma_state_init (); }/*
mm/nommu.c renamed from mm/nommu.c~mm-perform-vma-allocation-freeing-duplication-in-mm +3 -1
@@ -399,7 +399,8 @@ static const struct ctl_table nommu_tabl };/* -* initialise the percpu counter for VM and region record slabs +* initialise the percpu counter for VM and region record slabs, initialise VMA +* state. */ void __init mmap_init (void ) {
@@ -409,6 +410,7 @@ void __init mmap_init(void)VM_BUG_ON (ret); vm_region_jar =KMEM_CACHE (vm_region,SLAB_PANIC |SLAB_ACCOUNT );register_sysctl_init ("vm" , nommu_table); +vma_state_init (); }/*
mm/vma.h renamed from mm/vma.h~mm-perform-vma-allocation-freeing-duplication-in-mm +6 -0
@@ -550,6 +550,12 @@ int __vm_munmap(unsigned long start, sizint insert_vm_struct (struct mm_struct *mm,struct vm_area_struct *vma); +/* vma_init.h, shared between CONFIG_MMU and nommu. */ +void __init vma_state_init (void ); +struct vm_area_struct *vm_area_alloc (struct mm_struct *mm); +struct vm_area_struct *vm_area_dup (struct vm_area_struct *orig); +void vm_area_free (struct vm_area_struct *vma); +/* vma_exec.c */ #ifdef CONFIG_MMU int create_init_stack_vma(struct mm_struct *mm, struct vm_area_struct **vmap,
mm/vma_init.c new file +101 -0
101 lines not on this page · raw message
tools/testing/vma/Makefile renamed from tools/testing/vma/Makefile~mm-perform-vma-allocation-freeing-duplication-in-mm +1 -1
@@ -9,7 +9,7 @@ include ../shared/shared.mk OFILES = $(SHARED_OFILES) vma.o maple-shim.o TARGETS = vma -vma.o: vma.c vma_internal.h ../../../mm/vma.c ../../../mm/vma_exec.c ../../../mm/vma.h +vma.o: vma.c vma_internal.h ../../../mm/vma.c ../../../mm/vma_init.c ../../../mm/vma_exec.c ../../../mm/vma.h vma: $(OFILES) $(CC) $(CFLAGS) -o $@ $(OFILES) $(LDLIBS)
tools/testing/vma/vma.c renamed from tools/testing/vma/vma.c~mm-perform-vma-allocation-freeing-duplication-in-mm +17 -9
@@ -28,6 +28,7 @@ unsigned long stack_guard_gap = 256UL<<P* Directly import the VMA implementation here. Our vma_internal.h wrapper * provides userland-equivalent functionality for everything vma.c uses. */ +#include "../../../mm/vma_init.c" #include "../../../mm/vma_exec.c" #include "../../../mm/vma.c"
@@ -91,6 +92,12 @@ static int attach_vma(struct mm_struct *return res; } +static void detach_free_vma (struct vm_area_struct *vma) +{ +vma_mark_detached (vma); +vm_area_free (vma); +} +/* Helper function to allocate a VMA and link it to the tree. */ static struct vm_area_struct *alloc_and_link_vma(struct mm_struct *mm, unsigned long start,
@@ -104,7 +111,7 @@ static struct vm_area_struct *alloc_and_return NULL ;if (attach_vma (mm, vma)) { -vm_area_free (vma); +detach_free_vma (vma);return NULL ; }
@@ -249,7 +256,7 @@ static int cleanup_mm(struct mm_struct *vma_iter_set (vmi,0 );for_each_vma (*vmi, vma) { -vm_area_free (vma); +detach_free_vma (vma); count++; }
@@ -319,7 +326,7 @@ static bool test_simple_merge(void)ASSERT_EQ (vma->vm_pgoff,0 );ASSERT_EQ (vma->vm_flags, flags); -vm_area_free (vma); +detach_free_vma (vma);mtree_destroy (&mm.mm_mt);return true;
@@ -361,7 +368,7 @@ static bool test_simple_modify(void)ASSERT_EQ (vma->vm_end,0x1000 );ASSERT_EQ (vma->vm_pgoff,0 ); -vm_area_free (vma); +detach_free_vma (vma);vma_iter_clear (&vmi); vma =vma_next (&vmi);
@@ -370,7 +377,7 @@ static bool test_simple_modify(void)ASSERT_EQ (vma->vm_end,0x2000 );ASSERT_EQ (vma->vm_pgoff,1 ); -vm_area_free (vma); +detach_free_vma (vma);vma_iter_clear (&vmi); vma =vma_next (&vmi);
@@ -379,7 +386,7 @@ static bool test_simple_modify(void)ASSERT_EQ (vma->vm_end,0x3000 );ASSERT_EQ (vma->vm_pgoff,2 ); -vm_area_free (vma); +detach_free_vma (vma);mtree_destroy (&mm.mm_mt);return true;
@@ -407,7 +414,7 @@ static bool test_simple_expand(void)ASSERT_EQ (vma->vm_end,0x3000 );ASSERT_EQ (vma->vm_pgoff,0 ); -vm_area_free (vma); +detach_free_vma (vma);mtree_destroy (&mm.mm_mt);return true;
@@ -428,7 +435,7 @@ static bool test_simple_shrink(void)ASSERT_EQ (vma->vm_end,0x1000 );ASSERT_EQ (vma->vm_pgoff,0 ); -vm_area_free (vma); +detach_free_vma (vma);mtree_destroy (&mm.mm_mt);return true;
@@ -619,7 +626,7 @@ static bool test_merge_new(void)ASSERT_EQ (vma->vm_pgoff,0 );ASSERT_EQ (vma->anon_vma, &dummy_anon_vma); -vm_area_free (vma); +detach_free_vma (vma); count++; }
@@ -1668,6 +1675,7 @@ int main(void)int num_tests =0 , num_fail =0 ;maple_tree_init (); +vma_state_init ();#define TEST (name) \ do { \
tools/testing/vma/vma_internal.h renamed from tools/testing/vma/vma_internal.h~mm-perform-vma-allocation-freeing-duplication-in-mm +118 -25
191 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
maintainers-update-page-allocator-section.patch
maintainers-add-mm-reclaim-section.patch