DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kmemleak: Add support for memory hotplug

Browse Source 
Ensure that memory hotplug can co-exist with kmemleak
by taking the hotplug lock before scanning the memory
banks.

Change-Id: Ice6e5eaac45b4d71848ff1d3f30d468c1f088232
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
This commit is contained in:
Laura Abbott
2011-10-07 13:51:58 -07:00
parent 3ce4a81bc3
commit 94f202a4c2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Kconfig.debug
View File

@@ -413,7 +413,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

6
mm/kmemleak.c
View File

@@ -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.
@@ -1220,9 +1221,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;
@@ -1241,6 +1242,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).