Commit 5f369f37 authored by Catalin Marinas's avatar Catalin Marinas Committed by Linus Torvalds

mm: kmemleak: do not acquire scan_mutex in kmemleak_do_cleanup()

The kmemleak_do_cleanup() work thread already waits for the kmemleak_scan
thread to finish via kthread_stop().  Waiting in kthread_stop() while
scan_mutex is held may lead to deadlock if kmemleak_scan_thread() also
waits to acquire for scan_mutex.
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e781a9ab
...@@ -1762,7 +1762,6 @@ static void __kmemleak_do_cleanup(void) ...@@ -1762,7 +1762,6 @@ static void __kmemleak_do_cleanup(void)
*/ */
static void kmemleak_do_cleanup(struct work_struct *work) static void kmemleak_do_cleanup(struct work_struct *work)
{ {
mutex_lock(&scan_mutex);
stop_scan_thread(); stop_scan_thread();
/* /*
...@@ -1777,7 +1776,6 @@ static void kmemleak_do_cleanup(struct work_struct *work) ...@@ -1777,7 +1776,6 @@ static void kmemleak_do_cleanup(struct work_struct *work)
else else
pr_info("Kmemleak disabled without freeing internal data. " pr_info("Kmemleak disabled without freeing internal data. "
"Reclaim the memory with \"echo clear > /sys/kernel/debug/kmemleak\"\n"); "Reclaim the memory with \"echo clear > /sys/kernel/debug/kmemleak\"\n");
mutex_unlock(&scan_mutex);
} }
static DECLARE_WORK(cleanup_work, kmemleak_do_cleanup); static DECLARE_WORK(cleanup_work, kmemleak_do_cleanup);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment