mm-make-vm_area_desc-utilise-vma_flags_t-only.patch removed from -mm tree
The quilt patch titled
Subject: mm: make vm_area_desc utilise vma_flags_t only
has been removed from the -mm tree. Its filename was
mm-make-vm_area_desc-utilise-vma_flags_t-only.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: make vm_area_desc utilise vma_flags_t only
Date: Thu, 22 Jan 2026 16:06:19 +0000
Now we have eliminated all uses of vm_area_desc->vm_flags, eliminate this field, and have mmap_prepare users utilise the vma_flags_t vm_area_desc->vma_flags field only.
As part of this change we alter is_shared_maywrite() to accept a vma_flags_t parameter, and introduce is_shared_maywrite_vm_flags() for use with legacy vm_flags_t flags.
We also update struct mmap_state to add a union between vma_flags and vm_flags temporarily until the mmap logic is also converted to using vma_flags_t.
Also update the VMA userland tests to reflect this change.
---
include/linux/mm.h | 9 +++++++-- include/linux/mm_types.h | 5 +---- mm/filemap.c | 2 +- mm/util.c | 2 +- mm/vma.c | 11 +++++++---- mm/vma.h | 3 +-- tools/testing/vma/vma_internal.h | 9 +++++++-- 7 files changed, 25 insertions(+), 16 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-make-vm_area_desc-utilise-vma_flags_t-only +7 -2
@@ -1290,15 +1290,20 @@ static inline bool vma_is_accessible(conreturn vma->vm_flags &VM_ACCESS_FLAGS ; } -static inline bool is_shared_maywrite (vm_flags_t vm_flags) +static inline bool is_shared_maywrite_vm_flags (vm_flags_t vm_flags) {return (vm_flags & (VM_SHARED |VM_MAYWRITE )) == (VM_SHARED |VM_MAYWRITE ); } +static inline bool is_shared_maywrite (const vma_flags_t *flags) +{ +return vma_flags_test_all (flags,VMA_SHARED_BIT ,VMA_MAYWRITE_BIT ); +} +static inline bool vma_is_shared_maywrite (const struct vm_area_struct *vma) { -return is_shared_maywrite (vma->vm_flags); +return is_shared_maywrite (&vma->flags); } static inline
include/linux/mm_types.h renamed from include/linux/mm_types.h~mm-make-vm_area_desc-utilise-vma_flags_t-only +1 -4
@@ -887,10 +887,7 @@ struct vm_area_desc {/* Mutable fields. Populated with initial state. */ pgoff_t pgoff;struct file *vm_file; -union { -vm_flags_t vm_flags; -vma_flags_t vma_flags; - }; +vma_flags_t vma_flags;pgprot_t page_prot;/* Write-only fields. */
mm/filemap.c renamed from mm/filemap.c~mm-make-vm_area_desc-utilise-vma_flags_t-only +1 -1
@@ -4012,7 +4012,7 @@ int generic_file_readonly_mmap(struct fiint generic_file_readonly_mmap_prepare (struct vm_area_desc *desc) { -if (is_shared_maywrite (desc->vm_flags)) +if (is_shared_maywrite (&desc->vma_flags))return -EINVAL ;return generic_file_mmap_prepare (desc); }
mm/util.c renamed from mm/util.c~mm-make-vm_area_desc-utilise-vma_flags_t-only +1 -1
@@ -1154,7 +1154,7 @@ int __compat_vma_mmap(const struct file_ .pgoff = vma->vm_pgoff, .vm_file = vma->vm_file, - .vm_flags = vma->vm_flags, + .vma_flags = vma->flags, .page_prot = vma->vm_page_prot, .action.type = MMAP_NOTHING, /* Default */
mm/vma.c renamed from mm/vma.c~mm-make-vm_area_desc-utilise-vma_flags_t-only +7 -4
@@ -15,7 +15,10 @@ struct mmap_state {unsigned long end;pgoff_t pgoff;unsigned long pglen; -vm_flags_t vm_flags; +union { +vm_flags_t vm_flags; +vma_flags_t vma_flags; + };struct file *file;pgprot_t page_prot;
@@ -2369,7 +2372,7 @@ static void set_desc_from_map(struct vm_ desc->pgoff = map->pgoff; desc->vm_file = map->file; - desc->vm_flags = map->vm_flags; + desc->vma_flags = map->vma_flags; desc->page_prot = map->page_prot; }
@@ -2650,7 +2653,7 @@ static int call_mmap_prepare(struct mmap map->file_doesnt_need_get = true; map->file = desc->vm_file; } - map->vm_flags = desc->vm_flags; + map->vma_flags = desc->vma_flags; map->page_prot = desc->page_prot;/* User-defined fields. */ map->vm_ops = desc->vm_ops;
@@ -2823,7 +2826,7 @@ unsigned long mmap_region(struct file *freturn -EINVAL ;/* Map writable and ensure this isn't a sealed memfd. */ -if (file &&is_shared_maywrite (vm_flags)) { +if (file &&is_shared_maywrite_vm_flags (vm_flags)) {int error =mapping_map_writable (file->f_mapping);if (error)
mm/vma.h renamed from mm/vma.h~mm-make-vm_area_desc-utilise-vma_flags_t-only +1 -2
@@ -309,8 +309,7 @@ static inline void set_vma_from_desc(str vma->vm_pgoff = desc->pgoff;if (desc->vm_file != vma->vm_file)vma_set_file (vma, desc->vm_file); -if (desc->vm_flags != vma->vm_flags) -vm_flags_set (vma, desc->vm_flags); + vma->flags = desc->vma_flags; vma->vm_page_prot = desc->page_prot;/* User-defined fields. */
tools/testing/vma/vma_internal.h renamed from tools/testing/vma/vma_internal.h~mm-make-vm_area_desc-utilise-vma_flags_t-only +7 -2
@@ -1009,15 +1009,20 @@ static inline void vma_desc_clear_flags_#define vma_desc_clear_flags (desc, ...) \ vma_desc_clear_flags_mask(desc, mk_vma_flags(__VA_ARGS__)) -static inline bool is_shared_maywrite (vm_flags_t vm_flags) +static inline bool is_shared_maywrite_vm_flags (vm_flags_t vm_flags) {return (vm_flags & (VM_SHARED |VM_MAYWRITE )) == (VM_SHARED |VM_MAYWRITE ); } +static inline bool is_shared_maywrite (const vma_flags_t *flags) +{ +return vma_flags_test_all (flags,VMA_SHARED_BIT ,VMA_MAYWRITE_BIT ); +} +static inline bool vma_is_shared_maywrite (struct vm_area_struct *vma) { -return is_shared_maywrite (vma->vm_flags); +return is_shared_maywrite (&vma->flags); }static inline struct vm_area_struct *vma_next (struct vma_iterator *vmi)
_
Patches currently in -mm which might be from [email protected] are