On Thu, Aug 07, 2025 at 05:14:44PM +0800, Gu Bowen wrote:
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 4801751cb6b6..381145dde54f 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -390,9 +390,15 @@ static struct kmemleak_object *lookup_object(unsigned long ptr, int alias) else if (object->pointer == ptr || alias) return object; else {
/*
* Printk deferring due to the kmemleak_lock held.
* This is done to avoid deadlock.
*/
printk_deferred_enter(); kmemleak_warn("Found object by alias at 0x%08lx\n", ptr); dump_object_info(object);
} }printk_deferred_exit(); break;
This hunk is fine.
@@ -433,8 +439,15 @@ static struct kmemleak_object *mem_pool_alloc(gfp_t gfp) list_del(&object->object_list); else if (mem_pool_free_count) object = &mem_pool[--mem_pool_free_count];
- else
- else {
/*
* Printk deferring due to the kmemleak_lock held.
* This is done to avoid deadlock.
*/
pr_warn_once("Memory pool empty, consider increasing CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE\n");printk_deferred_enter();
printk_deferred_exit();
- } raw_spin_unlock_irqrestore(&kmemleak_lock, flags);
I wouldn't bother with printk deferring here, just set a bool warn variable and report it after unlocking. We recently merged another patch that does this.
return object; @@ -632,6 +645,11 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, else if (parent->pointer + parent->size <= ptr) link = &parent->rb_node.rb_right; else {
/*
* Printk deferring due to the kmemleak_lock held.
* This is done to avoid deadlock.
*/
printk_deferred_enter(); kmemleak_stop("Cannot insert 0x%lx into the object search tree (overlaps existing)\n", ptr); /*
@@ -639,6 +657,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, * be freed while the kmemleak_lock is held. */ dump_object_info(parent);
printk_deferred_exit();
This is part of __link_object(), called with the lock held, so easier to defer the printing as above.
BTW, the function names in the diff don't match mainline. Which kernel version is this patch based on?
With the second change above using a bool warn, feel free to add:
Reviewed-by: Catalin Marinas catalin.marinas@arm.com
Thanks.