execmem-move-execmem_force_rw-and-execmem_restore_rox-before-use.patch removed from -mm tree
The quilt patch titled
Subject: execmem: move execmem_force_rw() and execmem_restore_rox() before use
has been removed from the -mm tree. Its filename was
execmem-move-execmem_force_rw-and-execmem_restore_rox-before-use.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: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: execmem: move execmem_force_rw() and execmem_restore_rox() before use
Date: Sun, 13 Jul 2025 10:17:26 +0300
to avoid static declarations.
---
mm/execmem.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-)
mm/execmem.c renamed from mm/execmem.c~execmem-move-execmem_force_rw-and-execmem_restore_rox-before-use +21 -23
@@ -137,6 +137,27 @@ err_restore:return err; } +static int execmem_force_rw (void *ptr,size_t size) +{ +unsigned int nr =PAGE_ALIGN (size) >>PAGE_SHIFT ; +unsigned long addr = (unsigned long )ptr; +int ret; + + ret =set_memory_nx (addr, nr); +if (ret) +return ret; + +return set_memory_rw (addr, nr); +} + +int execmem_restore_rox (void *ptr,size_t size) +{ +unsigned int nr =PAGE_ALIGN (size) >>PAGE_SHIFT ; +unsigned long addr = (unsigned long )ptr; + +return set_memory_rox (addr, nr); +} +static void execmem_cache_clean (struct work_struct *work) {struct maple_tree *free_areas = &execmem_cache.free_areas;
@@ -328,8 +349,6 @@ static inline void *pending_free_clear(vreturn (void *)((unsigned long )ptr & ~PENDING_FREE_MASK ); } -static int execmem_force_rw (void *ptr,size_t size); -static int __execmem_cache_free (struct ma_state *mas,void *ptr,gfp_t gfp_mask) {size_t size =mas_range_len (mas);
@@ -415,27 +434,6 @@ static bool execmem_cache_free(void *ptr return true; } -static int execmem_force_rw (void *ptr,size_t size) -{ -unsigned int nr =PAGE_ALIGN (size) >>PAGE_SHIFT ; -unsigned long addr = (unsigned long )ptr; -int ret; - - ret =set_memory_nx (addr, nr); -if (ret) -return ret; - -return set_memory_rw (addr, nr); -} - -int execmem_restore_rox (void *ptr,size_t size) -{ -unsigned int nr =PAGE_ALIGN (size) >>PAGE_SHIFT ; -unsigned long addr = (unsigned long )ptr; - -return set_memory_rox (addr, nr); -} -#else /* CONFIG_ARCH_HAS_EXECMEM_ROX */ /* * when ROX cache is not used the permissions defined by architectures for
_
Patches currently in -mm which might be from [email protected] are
kho-add-test-for-kexec-handover.patch
kho-add-test-for-kexec-handover-fix.patch