execmem-introduce-execmem_alloc_rw.patch removed from -mm tree
The quilt patch titled
Subject: execmem: introduce execmem_alloc_rw()
has been removed from the -mm tree. Its filename was
execmem-introduce-execmem_alloc_rw.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: introduce execmem_alloc_rw()
Date: Sun, 13 Jul 2025 10:17:24 +0300
Some callers of execmem_alloc() require the memory to be temporarily writable even when it is allocated from ROX cache. These callers use execemem_make_temp_rw() right after the call to execmem_alloc().
Wrap this sequence in execmem_alloc_rw() API.
---
arch/x86/kernel/alternative.c | 3 -- include/linux/execmem.h | 38 ++++++++++++++++++-------------- kernel/module/main.c | 13 +--------- mm/execmem.c | 27 +++++++++++++++++++++- 4 files changed, 51 insertions(+), 30 deletions(-)
arch/x86/kernel/alternative.c renamed from arch/x86/kernel/alternative.c~execmem-introduce-execmem_alloc_rw +1 -2
@@ -120,7 +120,7 @@ struct its_array its_pages;static void *__its_alloc (struct its_array *pages) { - void *page __free(execmem) = execmem_alloc(EXECMEM_MODULE_TEXT, PAGE_SIZE); + void *page __free(execmem) = execmem_alloc_rw(EXECMEM_MODULE_TEXT, PAGE_SIZE);if (!page)return NULL ;
@@ -237,7 +237,6 @@ static void *its_alloc(void)if (!page)return NULL ; -execmem_make_temp_rw (page,PAGE_SIZE );if (pages == &its_pages)set_memory_x ((unsigned long )page,1 );
include/linux/execmem.h renamed from include/linux/execmem.h~execmem-introduce-execmem_alloc_rw +22 -16
@@ -68,21 +68,6 @@ enum execmem_range_flags {void execmem_fill_trapping_insns (void *ptr,size_t size,bool writable);/** -* execmem_make_temp_rw - temporarily remap region with read-write -* permissions -* @ptr: address of the region to remap -* @size: size of the region to remap -* -* Remaps a part of the cached large page in the ROX cache in the range -* [@ptr, @ptr + @size) as writable and not executable. The caller must -* have exclusive ownership of this range and ensure nothing will try to -* execute code in this range. -* -* Return: 0 on success or negative error code on failure. -*/ -int execmem_make_temp_rw (void *ptr,size_t size); - -/** * execmem_restore_rox - restore read-only-execute permissions * @ptr: address of the region to remap * @size: size of the region to remap
@@ -95,7 +80,6 @@ int execmem_make_temp_rw(void *ptr, size*/ int execmem_restore_rox (void *ptr,size_t size);#else -static inline int execmem_make_temp_rw (void *ptr,size_t size) {return 0 ; }static inline int execmem_restore_rox (void *ptr,size_t size) {return 0 ; }#endif
@@ -166,6 +150,28 @@ struct execmem_info *execmem_arch_setup(void *execmem_alloc (enum execmem_type type,size_t size);/** +* execmem_alloc_rw - allocate writable executable memory +* @type: type of the allocation +* @size: how many bytes of memory are required +* +* Allocates memory that will contain executable code, either generated or +* loaded from kernel modules. +* +* Allocates memory that will contain data coupled with executable code, +* like data sections in kernel modules. +* +* Forces writable permissions on the allocated memory and the caller is +* responsible to manage the permissions afterwards. +* +* For architectures that use ROX cache the permissions will be set to R+W. +* For architectures that don't use ROX cache the default permissions for @type +* will be used as they must be writable. +* +* Return: a pointer to the allocated memory or %NULL +*/ +void *execmem_alloc_rw (enum execmem_type type,size_t size); + +/** * execmem_free - free executable memory * @ptr: pointer to the memory that should be freed */
kernel/module/main.c renamed from kernel/module/main.c~execmem-introduce-execmem_alloc_rw +2 -11
@@ -1292,20 +1292,11 @@ static int module_memory_alloc(struct moelse execmem_type =EXECMEM_MODULE_TEXT ; - ptr =execmem_alloc (execmem_type, size); + ptr =execmem_alloc_rw (execmem_type, size);if (!ptr)return -ENOMEM ; -if (execmem_is_rox (execmem_type)) { -int err =execmem_make_temp_rw (ptr, size); - -if (err) { -execmem_free (ptr); -return -ENOMEM ; - } - - mod->mem[type].is_rox = true; - } + mod->mem[type].is_rox =execmem_is_rox (execmem_type);/* * The pointer to these blocks of memory are stored on the module
mm/execmem.c renamed from mm/execmem.c~execmem-introduce-execmem_alloc_rw +26 -1
@@ -336,7 +336,7 @@ static bool execmem_cache_free(void *ptrreturn true; } -int execmem_make_temp_rw (void *ptr,size_t size) +static int execmem_force_rw (void *ptr,size_t size) {unsigned int nr =PAGE_ALIGN (size) >>PAGE_SHIFT ;unsigned long addr = (unsigned long )ptr;
@@ -358,6 +358,16 @@ int execmem_restore_rox(void *ptr, size_ }#else /* CONFIG_ARCH_HAS_EXECMEM_ROX */ +/* +* when ROX cache is not used the permissions defined by architectures for +* execmem ranges that are updated before use (e.g. EXECMEM_MODULE_TEXT) must +* be writable anyway +*/ +static inline int execmem_force_rw (void *ptr,size_t size) +{ +return 0 ; +} +static void *execmem_cache_alloc (struct execmem_range *range,size_t size) {return NULL ;
@@ -387,6 +397,21 @@ void *execmem_alloc(enum execmem_type tyreturn kasan_reset_tag (p); } +void *execmem_alloc_rw (enum execmem_type type,size_t size) +{ + void *p __free(execmem) = execmem_alloc(type, size); +int err; + +if (!p) +return NULL ; + + err =execmem_force_rw (p, size); +if (err) +return NULL ; + +return no_free_ptr (p); +} +void execmem_free (void *ptr) {/*
_
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