]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm/kmemleak: avoid deadlock by moving pr_warn() outside kmemleak_lock
authorBreno Leitao <leitao@debian.org>
Thu, 31 Jul 2025 09:57:18 +0000 (02:57 -0700)
committerAndrew Morton <akpm@linux-foundation.org>
Tue, 5 Aug 2025 20:28:46 +0000 (13:28 -0700)
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/20250731-kmemleak_lock-v1-1-728fd470198f@debian.org
Fixes: c5665868183f ("mm: kmemleak: use the memory pool for early allocations")
Signed-off-by: Breno Leitao <leitao@debian.org>
Reported-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/kmemleak.c

index 8d588e6853110bfcee18102e818841ee2024a03e..e0333455c73841c55dc5fa58d21dba33e160baca 100644 (file)
@@ -470,6 +470,7 @@ static struct kmemleak_object *mem_pool_alloc(gfp_t gfp)
 {
        unsigned long flags;
        struct kmemleak_object *object;
+       bool warn = false;
 
        /* try the slab allocator first */
        if (object_cache) {
@@ -488,8 +489,10 @@ static struct kmemleak_object *mem_pool_alloc(gfp_t gfp)
        else if (mem_pool_free_count)
                object = &mem_pool[--mem_pool_free_count];
        else
-               pr_warn_once("Memory pool empty, consider increasing CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE\n");
+               warn = true;
        raw_spin_unlock_irqrestore(&kmemleak_lock, flags);
+       if (warn)
+               pr_warn_once("Memory pool empty, consider increasing CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE\n");
 
        return object;
 }