kasan-x86-arm64-s390-rename-functions-for-modules-shadow.patch removed from -mm tree
The patch titled
Subject: kasan, x86, arm64, s390: rename functions for modules shadow
has been removed from the -mm tree. Its filename was
kasan-x86-arm64-s390-rename-functions-for-modules-shadow.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: kasan, x86, arm64, s390: rename functions for modules shadow
Rename kasan_free_shadow to kasan_free_module_shadow and kasan_module_alloc to kasan_alloc_module_shadow.
These functions are used to allocate/free shadow memory for kernel modules when KASAN_VMALLOC is not enabled. The new names better reflect their purpose.
Also reword the comment next to their declaration to improve clarity.
---
arch/arm64/kernel/module.c | 2 +- arch/s390/kernel/module.c | 2 +- arch/x86/kernel/module.c | 2 +- include/linux/kasan.h | 14 +++++++------- mm/kasan/shadow.c | 4 ++-- mm/vmalloc.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-)
arch/arm64/kernel/module.c renamed from arch/arm64/kernel/module.c~kasan-x86-arm64-s390-rename-functions-for-modules-shadow +1 -1
@@ -58,7 +58,7 @@ void *module_alloc(unsigned long size)PAGE_KERNEL ,0 ,NUMA_NO_NODE , __builtin_return_address(0)); -if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) { +if (p && (kasan_alloc_module_shadow (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
arch/s390/kernel/module.c renamed from arch/s390/kernel/module.c~kasan-x86-arm64-s390-rename-functions-for-modules-shadow +1 -1
@@ -45,7 +45,7 @@ void *module_alloc(unsigned long size) p =__vmalloc_node_range (size,MODULE_ALIGN ,MODULES_VADDR ,MODULES_END , gfp_mask,PAGE_KERNEL_EXEC ,VM_DEFER_KMEMLEAK ,NUMA_NO_NODE ,__builtin_return_address (0 )); -if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) { +if (p && (kasan_alloc_module_shadow (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
arch/x86/kernel/module.c renamed from arch/x86/kernel/module.c~kasan-x86-arm64-s390-rename-functions-for-modules-shadow +1 -1
@@ -78,7 +78,7 @@ void *module_alloc(unsigned long size)MODULES_END , gfp_mask,PAGE_KERNEL ,VM_DEFER_KMEMLEAK ,NUMA_NO_NODE , __builtin_return_address(0)); -if (p && (kasan_module_alloc (p, size, gfp_mask) <0 )) { +if (p && (kasan_alloc_module_shadow (p, size, gfp_mask) <0 )) {vfree (p);return NULL ; }
include/linux/kasan.h renamed from include/linux/kasan.h~kasan-x86-arm64-s390-rename-functions-for-modules-shadow +7 -7
@@ -433,17 +433,17 @@ static inline void kasan_populate_early_ !defined (CONFIG_KASAN_VMALLOC )/* -* These functions provide a special case to support backing module -* allocations with real shadow memory. With KASAN vmalloc, the special -* case is unnecessary, as the work is handled in the generic case. +* These functions allocate and free shadow memory for kernel modules. +* They are only required when KASAN_VMALLOC is not supported, as otherwise +* shadow memory is allocated by the generic vmalloc handlers. */ -int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask); -void kasan_free_shadow (const struct vm_struct *vm); +int kasan_alloc_module_shadow (void *addr,size_t size,gfp_t gfp_mask); +void kasan_free_module_shadow (const struct vm_struct *vm);#else /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */ -static inline int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask) {return 0 ; } -static inline void kasan_free_shadow (const struct vm_struct *vm) {} +static inline int kasan_alloc_module_shadow (void *addr,size_t size,gfp_t gfp_mask) {return 0 ; } +static inline void kasan_free_module_shadow (const struct vm_struct *vm) {}#endif /* (CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) && !CONFIG_KASAN_VMALLOC */
mm/kasan/shadow.c renamed from mm/kasan/shadow.c~kasan-x86-arm64-s390-rename-functions-for-modules-shadow +2 -2
@@ -498,7 +498,7 @@ void kasan_release_vmalloc(unsigned long#else /* CONFIG_KASAN_VMALLOC */ -int kasan_module_alloc (void *addr,size_t size,gfp_t gfp_mask) +int kasan_alloc_module_shadow (void *addr,size_t size,gfp_t gfp_mask) {void *ret;size_t scaled_size;
@@ -534,7 +534,7 @@ int kasan_module_alloc(void *addr, size_return -ENOMEM ; } -void kasan_free_shadow (const struct vm_struct *vm) +void kasan_free_module_shadow (const struct vm_struct *vm) {if (vm->flags &VM_KASAN )vfree (kasan_mem_to_shadow (vm->addr));
mm/vmalloc.c renamed from mm/vmalloc.c~kasan-x86-arm64-s390-rename-functions-for-modules-shadow +1 -1
@@ -2547,7 +2547,7 @@ struct vm_struct *remove_vm_area(const v va->vm =NULL ;spin_unlock (&vmap_area_lock); -kasan_free_shadow (vm); +kasan_free_module_shadow (vm);free_unmap_vmap_area (va);return vm;
_
Patches currently in -mm which might be from [email protected] are
stacktrace-add-interface-based-on-shadow-call-stack.patch arm64-scs-save-scs_sp-values-per-cpu-when-switching-stacks.patch arm64-implement-stack_trace_save_shadow.patch kasan-use-stack_trace_save_shadow.patch