kasan-cleanup-of-kasan_enabled-checks.patch removed from -mm tree
The quilt patch titled
Subject: kasan: cleanup of kasan_enabled() checks
has been removed from the -mm tree. Its filename was
kasan-cleanup-of-kasan_enabled-checks.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: Sabyrzhan Tasbolatov <[email protected]>
Subject: kasan: cleanup of kasan_enabled() checks
Date: Thu, 9 Oct 2025 20:54:03 +0500
Deduplication of kasan_enabled() checks which are already used by callers.
* Altered functions:
check_page_allocation
Delete the check because callers have it already in __wrappers in include/linux/kasan.h:
__kasan_kfree_large __kasan_mempool_poison_pages __kasan_mempool_poison_object
kasan_populate_vmalloc, kasan_release_vmalloc
Add __wrappers in include/linux/kasan.h. They are called externally in mm/vmalloc.c.
__kasan_unpoison_vmalloc, __kasan_poison_vmalloc
Delete checks because there're already kasan_enabled() checks in respective __wrappers in include/linux/kasan.h.
release_free_meta -- Delete the check because the higher caller path
has it already. See the stack trace:
__kasan_slab_free -- has the check already __kasan_mempool_poison_object -- has the check already
poison_slab_object
kasan_save_free_info
release_free_meta
kasan_enabled() -- Delete here
---
include/linux/kasan.h | 20 ++++++++++++++++++-- mm/kasan/common.c | 3 --- mm/kasan/generic.c | 3 --- mm/kasan/shadow.c | 20 ++++---------------- 4 files changed, 22 insertions(+), 24 deletions(-)
include/linux/kasan.h renamed from include/linux/kasan.h~kasan-cleanup-of-kasan_enabled-checks +18 -2
@@ -571,11 +571,27 @@ static inline void kasan_init_hw_tags(vo#if defined(CONFIG_KASAN_GENERIC ) || defined(CONFIG_KASAN_SW_TAGS )void kasan_populate_early_vm_area_shadow (void *start,unsigned long size); -int kasan_populate_vmalloc (unsigned long addr,unsigned long size,gfp_t gfp_mask); -void kasan_release_vmalloc (unsigned long start,unsigned long end, +int __kasan_populate_vmalloc (unsigned long addr,unsigned long size,gfp_t gfp_mask); +static inline int kasan_populate_vmalloc (unsigned long addr, +unsigned long size,gfp_t gfp_mask) +{ +if (kasan_enabled ()) +return __kasan_populate_vmalloc (addr, size, gfp_mask); +return 0 ; +} +void __kasan_release_vmalloc (unsigned long start,unsigned long end,unsigned long free_region_start,unsigned long free_region_end,unsigned long flags); +static inline void kasan_release_vmalloc (unsigned long start,unsigned long end, +unsigned long free_region_start, +unsigned long free_region_end, +unsigned long flags) +{ +if (kasan_enabled ()) +return __kasan_release_vmalloc (start, end, free_region_start, + free_region_end, flags); +}#else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */
mm/kasan/common.c renamed from mm/kasan/common.c~kasan-cleanup-of-kasan_enabled-checks +0 -3
@@ -305,9 +305,6 @@ bool __kasan_slab_free(struct kmem_cachestatic inline bool check_page_allocation (void *ptr,unsigned long ip) { -if (!kasan_enabled ()) -return false; -if (ptr !=page_address (virt_to_head_page (ptr))) {kasan_report_invalid_free (ptr, ip,KASAN_REPORT_INVALID_FREE );return true;
mm/kasan/generic.c renamed from mm/kasan/generic.c~kasan-cleanup-of-kasan_enabled-checks +0 -3
@@ -506,9 +506,6 @@ static void release_alloc_meta(struct kastatic void release_free_meta (const void *object,struct kasan_free_meta *meta) { -if (!kasan_enabled ()) -return ; -/* Check if free meta is valid. */ if (*(u8 *)kasan_mem_to_shadow (object) !=KASAN_SLAB_FREE_META )return ;
mm/kasan/shadow.c renamed from mm/kasan/shadow.c~kasan-cleanup-of-kasan_enabled-checks +4 -16
@@ -354,7 +354,7 @@ static int ___alloc_pages_bulk(struct pareturn 0 ; } -static int __kasan_populate_vmalloc (unsigned long start,unsigned long end,gfp_t gfp_mask) +static int __kasan_populate_vmalloc_do (unsigned long start,unsigned long end,gfp_t gfp_mask) {unsigned long nr_pages, nr_total =PFN_UP (end - start);struct vmalloc_populate_data data;
@@ -395,14 +395,11 @@ static int __kasan_populate_vmalloc(unsireturn ret; } -int kasan_populate_vmalloc (unsigned long addr,unsigned long size,gfp_t gfp_mask) +int __kasan_populate_vmalloc (unsigned long addr,unsigned long size,gfp_t gfp_mask) {unsigned long shadow_start, shadow_end;int ret; -if (!kasan_enabled ()) -return 0 ; -if (!is_vmalloc_or_module_addr ((void *)addr))return 0 ;
@@ -424,7 +421,7 @@ int kasan_populate_vmalloc(unsigned long shadow_start =PAGE_ALIGN_DOWN (shadow_start); shadow_end =PAGE_ALIGN (shadow_end); - ret =__kasan_populate_vmalloc (shadow_start, shadow_end, gfp_mask); + ret =__kasan_populate_vmalloc_do (shadow_start, shadow_end, gfp_mask);if (ret)return ret;
@@ -566,7 +563,7 @@ static int kasan_depopulate_vmalloc_pte(* pages entirely covered by the free region, we will not run in to any * trouble - any simultaneous allocations will be for disjoint regions. */ -void kasan_release_vmalloc (unsigned long start,unsigned long end, +void __kasan_release_vmalloc (unsigned long start,unsigned long end,unsigned long free_region_start,unsigned long free_region_end,unsigned long flags)
@@ -575,9 +572,6 @@ void kasan_release_vmalloc(unsigned longunsigned long region_start, region_end;unsigned long size; -if (!kasan_enabled ()) -return ; - region_start =ALIGN (start,KASAN_MEMORY_PER_SHADOW_PAGE ); region_end =ALIGN_DOWN (end,KASAN_MEMORY_PER_SHADOW_PAGE );
@@ -626,9 +620,6 @@ void *__kasan_unpoison_vmalloc(const voi* with setting memory tags, so the KASAN_VMALLOC_INIT flag is ignored. */ -if (!kasan_enabled ()) -return (void *)start; -if (!is_vmalloc_or_module_addr (start))return (void *)start;
@@ -651,9 +642,6 @@ void *__kasan_unpoison_vmalloc(const voi*/ void __kasan_poison_vmalloc (const void *start,unsigned long size) { -if (!kasan_enabled ()) -return ; -if (!is_vmalloc_or_module_addr (start))return ;
_
Patches currently in -mm which might be from [email protected] are