[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: 4c4eb3ecc91f4fee6d6bf7cfbc1e21f2e38d19ff
WARNING: Author mismatch between patch and upstream commit: Backport author: Pawan Guptapawan.kumar.gupta@linux.intel.com Commit author: Thomas Gleixnertglx@linutronix.de
Status in newer kernel trees: 6.15.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (different SHA1: 05e85d376720) 5.15.y | Present (different SHA1: 4ad2d3c4d3cc)
Note: The patch differs from the upstream commit: --- 1: 4c4eb3ecc91f4 ! 1: 67491352c079b x86/modules: Set VM_FLUSH_RESET_PERMS in module_alloc() @@ Metadata ## Commit message ## x86/modules: Set VM_FLUSH_RESET_PERMS in module_alloc()
+ commit 4c4eb3ecc91f4fee6d6bf7cfbc1e21f2e38d19ff upstream. + Instead of resetting permissions all over the place when freeing module memory tell the vmalloc code to do so. Avoids the exercise for the next upcoming user. @@ Commit message Signed-off-by: Thomas Gleixner tglx@linutronix.de Signed-off-by: Peter Zijlstra (Intel) peterz@infradead.org Link: https://lore.kernel.org/r/20220915111143.406703869@infradead.org + Signed-off-by: Pawan Gupta pawan.kumar.gupta@linux.intel.com
## arch/x86/kernel/ftrace.c ## @@ arch/x86/kernel/ftrace.c: create_trampoline(struct ftrace_ops *ops, unsigned int *tramp_size) @@ arch/x86/kernel/module.c: void *module_alloc(unsigned long size)
p = __vmalloc_node_range(size, MODULE_ALIGN, - MODULES_VADDR + get_module_load_offset(), -- MODULES_END, gfp_mask, -- PAGE_KERNEL, VM_DEFER_KMEMLEAK, NUMA_NO_NODE, +- MODULES_END, GFP_KERNEL, +- PAGE_KERNEL, 0, NUMA_NO_NODE, - __builtin_return_address(0)); + MODULES_VADDR + get_module_load_offset(), -+ MODULES_END, gfp_mask, PAGE_KERNEL, -+ VM_FLUSH_RESET_PERMS | VM_DEFER_KMEMLEAK, -+ NUMA_NO_NODE, __builtin_return_address(0)); -+ - if (p && (kasan_alloc_module_shadow(p, size, gfp_mask) < 0)) { ++ MODULES_END, GFP_KERNEL, PAGE_KERNEL, ++ VM_FLUSH_RESET_PERMS, NUMA_NO_NODE, ++ __builtin_return_address(0)); + if (p && (kasan_module_alloc(p, size) < 0)) { vfree(p); return NULL; ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.15.y | Success | Success |