Commit 029aeff5 authored by Laura Abbott's avatar Laura Abbott Committed by Catalin Marinas

kmemleak: Add support for memory hotplug

Ensure that memory hotplug can co-exist with kmemleak
by taking the hotplug lock before scanning the memory
banks.
Signed-off-by: default avatarLaura Abbott <lauraa@codeaurora.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f528f0b8
...@@ -414,7 +414,7 @@ config SLUB_STATS ...@@ -414,7 +414,7 @@ config SLUB_STATS
config DEBUG_KMEMLEAK config DEBUG_KMEMLEAK
bool "Kernel memory leak detector" bool "Kernel memory leak detector"
depends on DEBUG_KERNEL && EXPERIMENTAL && !MEMORY_HOTPLUG && \ depends on DEBUG_KERNEL && EXPERIMENTAL && \
(X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE) (X86 || ARM || PPC || MIPS || S390 || SPARC64 || SUPERH || MICROBLAZE || TILE)
select DEBUG_FS select DEBUG_FS
......
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
#include <linux/kmemcheck.h> #include <linux/kmemcheck.h>
#include <linux/kmemleak.h> #include <linux/kmemleak.h>
#include <linux/memory_hotplug.h>
/* /*
* Kmemleak configuration and common defines. * Kmemleak configuration and common defines.
...@@ -1292,9 +1293,9 @@ static void kmemleak_scan(void) ...@@ -1292,9 +1293,9 @@ static void kmemleak_scan(void)
#endif #endif
/* /*
* Struct page scanning for each node. The code below is not yet safe * Struct page scanning for each node.
* with MEMORY_HOTPLUG.
*/ */
lock_memory_hotplug();
for_each_online_node(i) { for_each_online_node(i) {
pg_data_t *pgdat = NODE_DATA(i); pg_data_t *pgdat = NODE_DATA(i);
unsigned long start_pfn = pgdat->node_start_pfn; unsigned long start_pfn = pgdat->node_start_pfn;
...@@ -1313,6 +1314,7 @@ static void kmemleak_scan(void) ...@@ -1313,6 +1314,7 @@ static void kmemleak_scan(void)
scan_block(page, page + 1, NULL, 1); scan_block(page, page + 1, NULL, 1);
} }
} }
unlock_memory_hotplug();
/* /*
* Scanning the task stacks (may introduce false negatives). * Scanning the task stacks (may introduce false negatives).
......
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