Messages in this thread Patch in this message | | | Date | Sat, 29 Apr 2006 03:18:29 +0200 | From | Arnd Bergmann <> | Subject | [PATCH 2/4] sparsemem interaction with memory add bug fixes |
| |
From: Mike Kravetz <mjkravetz@verizon.net>
This patch fixes two bugs with the way sparsemem interacts with memory add. They are:
- memory leak if memmap for section already exists
- calling alloc_bootmem_node() after boot
These bugs were discovered and a first cut at the fixes were provided by Arnd Bergmann <arnd@arndb.de> and Joel Schopp <jschopp@us.ibm.com>.
Signed-off-by: Mike Kravetz <kravetz@us.ibm.com> Signed-off-by: Joel Schopp <jschopp@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> ---
mm/sparse.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
diff -puN mm/sparse.c~sparsemem-interaction-with-memory-add-bug-fixes mm/sparse.c --- 25/mm/sparse.c~sparsemem-interaction-with-memory-add-bug-fixes Wed Apr 12 14:38:04 2006 +++ 25-akpm/mm/sparse.c Wed Apr 12 14:38:04 2006 @@ -32,7 +32,10 @@ static struct mem_section *sparse_index_ unsigned long array_size = SECTIONS_PER_ROOT * sizeof(struct mem_section); - section = alloc_bootmem_node(NODE_DATA(nid), array_size); + if (system_state == SYSTEM_RUNNING) + section = kmalloc_node(array_size, GFP_KERNEL, nid); + else + section = alloc_bootmem_node(NODE_DATA(nid), array_size); if (section) memset(section, 0, array_size); @@ -281,9 +284,9 @@ int sparse_add_one_section(struct zone * ret = sparse_init_one_section(ms, section_nr, memmap); - if (ret <= 0) - __kfree_section_memmap(memmap, nr_pages); out: pgdat_resize_unlock(pgdat, &flags); + if (ret <= 0) + __kfree_section_memmap(memmap, nr_pages); return ret; } _ --
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |