Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Date | Wed, 12 Apr 2006 10:19:28 -0700 | From | Mike Kravetz <> | Subject | [PATCH] sparsemem interaction with memory add bug fixes |
| |
Updated version of patch with Andy's suggestion.
Fix two bugs with the way sparsemem interacts with memory add: - memory leak if memmap for section already exists - calling alloc_bootmem_node() after boot
Signed-off-by: Joel Schopp <jschopp@austin.ibm.com> Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Mike Kravetz <kravetz@us.ibm.com>
diff -Naupr linux-2.6.17-rc1-mm2/mm/sparse.c linux-2.6.17-rc1-mm2.work/mm/sparse.c --- linux-2.6.17-rc1-mm2/mm/sparse.c 2006-04-03 03:22:10.000000000 +0000 +++ linux-2.6.17-rc1-mm2.work/mm/sparse.c 2006-04-12 17:21:11.000000000 +0000 @@ -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/
| ![\](/images/icornerr.gif) |