Skip to content

Commit 47b0f6d

Browse files
leitaoakpm00
authored andcommitted
mm/kmemleak: avoid deadlock by moving pr_warn() outside kmemleak_lock
When netpoll is enabled, calling pr_warn_once() while holding kmemleak_lock in mem_pool_alloc() can cause a deadlock due to lock inversion with the netconsole subsystem. This occurs because pr_warn_once() may trigger netpoll, which eventually leads to __alloc_skb() and back into kmemleak code, attempting to reacquire kmemleak_lock. This is the path for the deadlock. mem_pool_alloc() -> raw_spin_lock_irqsave(&kmemleak_lock, flags); -> pr_warn_once() -> netconsole subsystem -> netpoll -> __alloc_skb -> __create_object -> raw_spin_lock_irqsave(&kmemleak_lock, flags); Fix this by setting a flag and issuing the pr_warn_once() after kmemleak_lock is released. Link: https://lkml.kernel.org/r/[email protected] Fixes: c566586 ("mm: kmemleak: use the memory pool for early allocations") Signed-off-by: Breno Leitao <[email protected]> Reported-by: Jakub Kicinski <[email protected]> Acked-by: Catalin Marinas <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 475356f commit 47b0f6d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

mm/kmemleak.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ static struct kmemleak_object *mem_pool_alloc(gfp_t gfp)
470470
{
471471
unsigned long flags;
472472
struct kmemleak_object *object;
473+
bool warn = false;
473474

474475
/* try the slab allocator first */
475476
if (object_cache) {
@@ -488,8 +489,10 @@ static struct kmemleak_object *mem_pool_alloc(gfp_t gfp)
488489
else if (mem_pool_free_count)
489490
object = &mem_pool[--mem_pool_free_count];
490491
else
491-
pr_warn_once("Memory pool empty, consider increasing CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE\n");
492+
warn = true;
492493
raw_spin_unlock_irqrestore(&kmemleak_lock, flags);
494+
if (warn)
495+
pr_warn_once("Memory pool empty, consider increasing CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE\n");
493496

494497
return object;
495498
}

0 commit comments

Comments
 (0)