mm-refactor-vm_area_struct-anon_vma_name-usage-code.patch removed from -mm tree
The patch titled
Subject: mm: refactor vm_area_struct::anon_vma_name usage code
has been removed from the -mm tree. Its filename was
mm-refactor-vm_area_struct-anon_vma_name-usage-code.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Suren Baghdasaryan <[email protected]>
Subject: mm: refactor vm_area_struct::anon_vma_name usage code
Avoid mixing strings and their anon_vma_name referenced pointers by using struct anon_vma_name whenever possible. This simplifies the code and allows easier sharing of anon_vma_name structures when they represent the same name.
---
fs/proc/task_mmu.c | 6 +- fs/userfaultfd.c | 6 +- include/linux/mm.h | 7 +- include/linux/mm_inline.h | 87 ++++++++++++++++++++++++------------ include/linux/mm_types.h | 5 +- kernel/fork.c | 4 - kernel/sys.c | 19 ++++--- mm/madvise.c | 87 ++++++++++++------------------------ mm/mempolicy.c | 2 mm/mlock.c | 2 mm/mmap.c | 12 ++-- mm/mprotect.c | 2 12 files changed, 125 insertions(+), 114 deletions(-)
fs/proc/task_mmu.c renamed from fs/proc/task_mmu.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +3 -3
@@ -309,7 +309,7 @@ show_map_vma(struct seq_file *m, struct name =arch_vma_name (vma);if (!name) { -const char *anon_name; +struct anon_vma_name *anon_name;if (!mm) { name ="[vdso]" ;
@@ -327,10 +327,10 @@ show_map_vma(struct seq_file *m, struct goto done; } - anon_name =vma_anon_name (vma); + anon_name =anon_vma_name (vma);if (anon_name) {seq_pad (m,' ' ); -seq_printf (m,"[anon:%s]" , anon_name); +seq_printf (m,"[anon:%s]" , anon_name->name); } }
fs/userfaultfd.c renamed from fs/userfaultfd.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +3 -3
@@ -878,7 +878,7 @@ static int userfaultfd_release(struct in new_flags, vma->anon_vma, vma->vm_file, vma->vm_pgoff,vma_policy (vma), - NULL_VM_UFFD_CTX, vma_anon_name(vma)); + NULL_VM_UFFD_CTX, anon_vma_name(vma));if (prev) vma = prev;else
@@ -1438,7 +1438,7 @@ static int userfaultfd_register(struct u vma->anon_vma, vma->vm_file, vma->vm_pgoff,vma_policy (vma), ((struct vm_userfaultfd_ctx ){ ctx }), - vma_anon_name(vma)); + anon_vma_name(vma));if (prev) { vma = prev; goto next;
@@ -1615,7 +1615,7 @@ static int userfaultfd_unregister(struct prev =vma_merge (mm, prev, start, vma_end, new_flags, vma->anon_vma, vma->vm_file, vma->vm_pgoff,vma_policy (vma), -NULL_VM_UFFD_CTX ,vma_anon_name (vma)); +NULL_VM_UFFD_CTX ,anon_vma_name (vma));if (prev) { vma = prev; goto next;
include/linux/mm.h renamed from include/linux/mm.h~mm-refactor-vm_area_struct-anon_vma_name-usage-code +4 -3
@@ -2626,7 +2626,7 @@ static inline int vma_adjust(struct vm_aextern struct vm_area_struct *vma_merge (struct mm_struct *,struct vm_area_struct *prev,unsigned long addr,unsigned long end,unsigned long vm_flags,struct anon_vma *,struct file *,pgoff_t , -struct mempolicy *,struct vm_userfaultfd_ctx ,const char *); +struct mempolicy *,struct vm_userfaultfd_ctx ,struct anon_vma_name *);extern struct anon_vma *find_mergeable_anon_vma (struct vm_area_struct *);extern int __split_vma (struct mm_struct *,struct vm_area_struct *,unsigned long addr,int new_below);
@@ -3372,11 +3372,12 @@ static inline int seal_check_future_writ#ifdef CONFIG_ANON_VMA_NAME int madvise_set_anon_name (struct mm_struct *mm,unsigned long start, -unsigned long len_in,const char *name); +unsigned long len_in, +struct anon_vma_name *anon_name);#else static inline int madvise_set_anon_name (struct mm_struct *mm,unsigned long start, -unsigned long len_in,const char *name) { +unsigned long len_in,struct anon_vma_name *anon_name) {return 0 ; }#endif
include/linux/mm_inline.h renamed from include/linux/mm_inline.h~mm-refactor-vm_area_struct-anon_vma_name-usage-code +59 -28
109 lines not on this page · raw message
include/linux/mm_types.h renamed from include/linux/mm_types.h~mm-refactor-vm_area_struct-anon_vma_name-usage-code +4 -1
@@ -416,7 +416,10 @@ struct vm_area_struct {struct rb_node rb;unsigned long rb_subtree_last; } shared; -/* Serialized by mmap_sem. */ +/* +* Serialized by mmap_sem. Never use directly because it is +* valid only when vm_file is NULL. Use anon_vma_name instead. +*/ struct anon_vma_name *anon_name; };
kernel/fork.c renamed from kernel/fork.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +2 -2
@@ -366,14 +366,14 @@ struct vm_area_struct *vm_area_dup(struc *new =data_race (*orig);INIT_LIST_HEAD (&new->anon_vma_chain); new->vm_next = new->vm_prev =NULL ; -dup_vma_anon_name (orig, new); +dup_anon_vma_name (orig, new); }return new; }void vm_area_free (struct vm_area_struct *vma) { -free_vma_anon_name (vma); +free_anon_vma_name (vma);kmem_cache_free (vm_area_cachep, vma); }
kernel/sys.c renamed from kernel/sys.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +12 -7
@@ -7,6 +7,7 @@#include <linux/export.h> #include <linux/mm.h> +#include <linux/mm_inline.h> #include <linux/utsname.h> #include <linux/mman.h> #include <linux/reboot.h>
@@ -2286,15 +2287,16 @@ static int prctl_set_vma(unsigned long o {struct mm_struct *mm = current->mm;const char __user *uname; -char *name, *pch; +struct anon_vma_name *anon_name =NULL ;int error;switch (opt) {case PR_SET_VMA_ANON_NAME : uname = (const char __user *)arg;if (uname) { - name =strndup_user (uname,ANON_VMA_NAME_MAX_LEN ); +char *name, *pch; + name =strndup_user (uname,ANON_VMA_NAME_MAX_LEN );if (IS_ERR (name))return PTR_ERR (name);
@@ -2304,15 +2306,18 @@ static int prctl_set_vma(unsigned long oreturn -EINVAL ; } } - }else { -/* Reset the name */ - name =NULL ; +/* anon_vma has its own copy */ + anon_name =anon_vma_name_alloc (name); +kfree (name); +if (!anon_name) +return -ENOMEM ; + }mmap_write_lock (mm); - error =madvise_set_anon_name (mm, addr, size, name); + error =madvise_set_anon_name (mm, addr, size, anon_name);mmap_write_unlock (mm); -kfree (name); +anon_vma_name_put (anon_name);break ;default : error = -EINVAL ;
mm/madvise.c renamed from mm/madvise.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +29 -58
176 lines not on this page · raw message
mm/mempolicy.c renamed from mm/mempolicy.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +1 -1
@@ -814,7 +814,7 @@ static int mbind_range(struct mm_struct prev =vma_merge (mm, prev, vmstart, vmend, vma->vm_flags, vma->anon_vma, vma->vm_file, pgoff, new_pol, vma->vm_userfaultfd_ctx, -vma_anon_name (vma)); +anon_vma_name (vma));if (prev) { vma = prev; next = vma->vm_next;
mm/mlock.c renamed from mm/mlock.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +1 -1
@@ -512,7 +512,7 @@ static int mlock_fixup(struct vm_area_st pgoff = vma->vm_pgoff + ((start - vma->vm_start) >>PAGE_SHIFT ); *prev =vma_merge (mm, *prev, start, end, newflags, vma->anon_vma, vma->vm_file, pgoff,vma_policy (vma), - vma->vm_userfaultfd_ctx,vma_anon_name (vma)); + vma->vm_userfaultfd_ctx,anon_vma_name (vma));if (*prev) { vma = *prev; goto success;
mm/mmap.c renamed from mm/mmap.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +6 -6
@@ -1031,7 +1031,7 @@ again:static inline int is_mergeable_vma (struct vm_area_struct *vma,struct file *file,unsigned long vm_flags,struct vm_userfaultfd_ctx vm_userfaultfd_ctx, -const char *anon_name) +struct anon_vma_name *anon_name) {/* * VM_SOFTDIRTY should not prevent from VMA merging, if we
@@ -1049,7 +1049,7 @@ static inline int is_mergeable_vma(strucreturn 0 ;if (!is_mergeable_vm_userfaultfd_ctx (vma, vm_userfaultfd_ctx))return 0 ; -if (!is_same_vma_anon_name (vma, anon_name)) +if (!anon_vma_name_eq (anon_vma_name (vma), anon_name))return 0 ;return 1 ; }
@@ -1084,7 +1084,7 @@ can_vma_merge_before(struct vm_area_stru struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff, struct vm_userfaultfd_ctx vm_userfaultfd_ctx, - const char *anon_name) + struct anon_vma_name *anon_name) { if (is_mergeable_vma(vma, file, vm_flags, vm_userfaultfd_ctx, anon_name) && is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
@@ -1106,7 +1106,7 @@ can_vma_merge_after(struct vm_area_struc struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff, struct vm_userfaultfd_ctx vm_userfaultfd_ctx, - const char *anon_name) + struct anon_vma_name *anon_name) { if (is_mergeable_vma(vma, file, vm_flags, vm_userfaultfd_ctx, anon_name) && is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
@@ -1167,7 +1167,7 @@ struct vm_area_struct *vma_merge(struct struct anon_vma *anon_vma, struct file *file, pgoff_t pgoff, struct mempolicy *policy, struct vm_userfaultfd_ctx vm_userfaultfd_ctx, - const char *anon_name) + struct anon_vma_name *anon_name) { pgoff_t pglen = (end - addr) >> PAGE_SHIFT;struct vm_area_struct *area, *next;
@@ -3256,7 +3256,7 @@ struct vm_area_struct *copy_vma(struct vreturn NULL ;/* should never get here */ new_vma =vma_merge (mm, prev, addr, addr + len, vma->vm_flags, vma->anon_vma, vma->vm_file, pgoff,vma_policy (vma), - vma->vm_userfaultfd_ctx,vma_anon_name (vma)); + vma->vm_userfaultfd_ctx,anon_vma_name (vma));if (new_vma) {/* * Source vma may have been merged into new_vma
mm/mprotect.c renamed from mm/mprotect.c~mm-refactor-vm_area_struct-anon_vma_name-usage-code +1 -1
@@ -464,7 +464,7 @@ mprotect_fixup(struct vm_area_struct *vm pgoff = vma->vm_pgoff + ((start - vma->vm_start) >>PAGE_SHIFT ); *pprev =vma_merge (mm, *pprev, start, end, newflags, vma->anon_vma, vma->vm_file, pgoff,vma_policy (vma), - vma->vm_userfaultfd_ctx,vma_anon_name (vma)); + vma->vm_userfaultfd_ctx,anon_vma_name (vma));if (*pprev) { vma = *pprev;VM_WARN_ON ((vma->vm_flags ^ newflags) & ~VM_SOFTDIRTY );
_
Patches currently in -mm which might be from [email protected] are
mm-count-time-in-drain_all_pages-during-direct-reclaim-as-memory-pressure.patch