execmem-drop-writable-parameter-from-execmem_fill_trapping_insns.patch removed from -mm tree
The quilt patch titled
Subject: execmem: drop writable parameter from execmem_fill_trapping_insns()
has been removed from the -mm tree. Its filename was
execmem-drop-writable-parameter-from-execmem_fill_trapping_insns.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: drop writable parameter from execmem_fill_trapping_insns()
Date: Sun, 13 Jul 2025 10:17:28 +0300
After update of execmem_cache_free() that made memory writable before updating it, there is no need to update read only memory, so the writable parameter to execmem_fill_trapping_insns() is not needed. Drop it.
---
arch/x86/mm/init.c | 8 ++------ include/linux/execmem.h | 3 +-- mm/execmem.c | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-)
arch/x86/mm/init.c renamed from arch/x86/mm/init.c~execmem-drop-writable-parameter-from-execmem_fill_trapping_insns +2 -6
@@ -1063,13 +1063,9 @@ unsigned long arch_max_swapfile_size(voistatic struct execmem_info execmem_info__ro_after_init ;#ifdef CONFIG_ARCH_HAS_EXECMEM_ROX -void execmem_fill_trapping_insns (void *ptr,size_t size,bool writeable) +void execmem_fill_trapping_insns (void *ptr,size_t size) { -/* fill memory with INT3 instructions */ -if (writeable) -memset (ptr,INT3_INSN_OPCODE , size); -else -text_poke_set (ptr,INT3_INSN_OPCODE , size); +memset (ptr,INT3_INSN_OPCODE , size); }#endif
include/linux/execmem.h renamed from include/linux/execmem.h~execmem-drop-writable-parameter-from-execmem_fill_trapping_insns +1 -2
@@ -60,12 +60,11 @@ enum execmem_range_flags {* will trap * @ptr: pointer to memory to fill * @size: size of the range to fill -* @writable: is the memory poited by @ptr is writable or ROX * * A hook for architecures to fill execmem ranges with invalid instructions. * Architectures that use EXECMEM_ROX_CACHE must implement this. */ -void execmem_fill_trapping_insns (void *ptr,size_t size,bool writable); +void execmem_fill_trapping_insns (void *ptr,size_t size);/** * execmem_restore_rox - restore read-only-execute permissions
mm/execmem.c renamed from mm/execmem.c~execmem-drop-writable-parameter-from-execmem_fill_trapping_insns +2 -2
@@ -304,7 +304,7 @@ static int execmem_cache_populate(struct goto err_free_mem;/* fill memory with instructions that will trap */ -execmem_fill_trapping_insns (p, alloc_size,/* writable = */ true); +execmem_fill_trapping_insns (p, alloc_size); err =set_memory_rox ((unsigned long )p, vm->nr_pages);if (err)
@@ -363,7 +363,7 @@ static int __execmem_cache_free(struct mif (err)return err; -execmem_fill_trapping_insns (ptr, size,/* writable = */ true); +execmem_fill_trapping_insns (ptr, size);execmem_restore_rox (ptr, size); err =execmem_cache_add_locked (ptr, size, gfp_mask);
_
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