mm-mseal-small-cleanups.patch removed from -mm tree
The quilt patch titled
Subject: mm/mseal: small cleanups
has been removed from the -mm tree. Its filename was
mm-mseal-small-cleanups.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/mseal: small cleanups
Date: Fri, 25 Jul 2025 09:29:43 +0100
Drop the wholly unnecessary set_vma_sealed() helper(), which is used only once, and place VMA_ITERATOR() declarations in the correct place.
Retain vma_is_sealed(), and use it instead of the confusingly named can_modify_vma(), so it's abundantly clear what's being tested, rather then a nebulous sense of 'can the VMA be modified'.
No functional change intended.
---
mm/madvise.c | 2 +- mm/mprotect.c | 2 +- mm/mremap.c | 2 +- mm/mseal.c | 9 +-------- mm/vma.c | 4 ++-- mm/vma.h | 20 ++------------------ 6 files changed, 8 insertions(+), 31 deletions(-)
mm/madvise.c renamed from mm/madvise.c~mm-mseal-small-cleanups +1 -1
@@ -1287,7 +1287,7 @@ static bool can_madvise_modify(struct mastruct vm_area_struct *vma = madv_behavior->vma;/* If the VMA isn't sealed we're good. */ -if (can_modify_vma (vma)) +if (!vma_is_sealed (vma))return true;/* For a sealed VMA, we only care about discard operations. */
mm/mprotect.c renamed from mm/mprotect.c~mm-mseal-small-cleanups +1 -1
@@ -766,7 +766,7 @@ mprotect_fixup(struct vma_iterator *vmi,unsigned long charged =0 ;int error; -if (!can_modify_vma (vma)) +if (vma_is_sealed (vma))return -EPERM ;if (newflags == oldflags) {
mm/mremap.c renamed from mm/mremap.c~mm-mseal-small-cleanups +1 -1
@@ -1651,7 +1651,7 @@ static int check_prep_vma(struct vma_remreturn -EFAULT ;/* If mseal()'d, mremap() is prohibited. */ -if (!can_modify_vma (vma)) +if (vma_is_sealed (vma))return -EPERM ;/* Align to hugetlb page size, if required. */
mm/mseal.c renamed from mm/mseal.c~mm-mseal-small-cleanups +1 -8
@@ -15,11 +15,6 @@#include <linux/sched.h> #include "internal.h" -static inline void set_vma_sealed (struct vm_area_struct *vma) -{ -vm_flags_set (vma,VM_SEALED ); -} -static int mseal_fixup (struct vma_iterator *vmi,struct vm_area_struct *vma,struct vm_area_struct **prev,unsigned long start,unsigned long end,vm_flags_t newflags)
@@ -36,7 +31,7 @@ static int mseal_fixup(struct vma_iterat goto out; } -set_vma_sealed (vma); +vm_flags_set (vma,VM_SEALED ); out: *prev = vma;return ret;
@@ -53,7 +48,6 @@ static int check_mm_seal(unsigned long s {struct vm_area_struct *vma;unsigned long nstart = start; -VMA_ITERATOR (vmi, current->mm, start);/* going through each vma to check. */
@@ -78,7 +72,6 @@ static int apply_mm_seal(unsigned long s {unsigned long nstart;struct vm_area_struct *vma, *prev; -VMA_ITERATOR (vmi, current->mm, start); vma =vma_iter_load (&vmi);
mm/vma.c renamed from mm/vma.c~mm-mseal-small-cleanups +2 -2
@@ -1351,7 +1351,7 @@ static int vms_gather_munmap_vmas(struct }/* Don't bother splitting the VMA if we can't unmap it anyway */ -if (!can_modify_vma (vms->vma)) { +if (vma_is_sealed (vms->vma)) { error = -EPERM ; goto start_split_failed; }
@@ -1371,7 +1371,7 @@ static int vms_gather_munmap_vmas(structfor_each_vma_range (*(vms->vmi), next, vms->end) {long nrpages; -if (!can_modify_vma (next)) { +if (vma_is_sealed (next)) { error = -EPERM ; goto modify_vma_failed; }
mm/vma.h renamed from mm/vma.h~mm-mseal-small-cleanups +2 -18
@@ -559,31 +559,15 @@ struct vm_area_struct *vma_iter_next_rew }#ifdef CONFIG_64BIT -static inline bool vma_is_sealed (struct vm_area_struct *vma) {return (vma->vm_flags &VM_SEALED ); } - -/* -* check if a vma is sealed for modification. -* return true, if modification is allowed. -*/ -static inline bool can_modify_vma (struct vm_area_struct *vma) -{ -if (unlikely (vma_is_sealed (vma))) -return false; - -return true; -} -#else - -static inline bool can_modify_vma (struct vm_area_struct *vma) +static inline bool vma_is_sealed (struct vm_area_struct *vma) { -return true; +return false; } -#endif #if defined(CONFIG_STACK_GROWSUP )
_
Patches currently in -mm which might be from [email protected] are