On Thu, May 10, 2012 at 02:44:39PM -0700, Andrew Morton wrote:
> On Mon, 7 May 2012 13:37:52 +0200
> Johannes Weiner <hannes@xxxxxxxxxxx> wrote:
>
> > alloc_bootmem_section() derives allocation area constraints from the
> > specified sparsemem section. This is a bit specific for a generic
> > memory allocator like bootmem, though, so move it over to sparsemem.
> >
> > As __alloc_bootmem_node_nopanic() already retries failed allocations
> > with relaxed area constraints, the fallback code in sparsemem.c can be
> > removed and the code becomes a bit more compact overall.
> >
> > ...
> >
> > @@ -332,9 +334,9 @@ static void __init check_usemap_section_nr(int nid, unsigned long *usemap)
> > #else
> > static unsigned long * __init
> > sparse_early_usemaps_alloc_pgdat_section(struct pglist_data *pgdat,
> > - unsigned long count)
> > + unsigned long size)
> > {
> > - return NULL;
> > + return alloc_bootmem_node_nopanic(pgdat, size)
>
> You've been bad. Your penance is to runtime test this code with
> CONFIG_MEMORY_HOTREMOVE=n!
I did now.
See, but I DID test the =y case, missed an obvious bug and even
considered the particular node-section dependency warnings to be
expected in the setup configuration. Testing is no way around being a
cretin :(
So here is another fix:
---
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: [patch] mm: remove sparsemem allocation details from the bootmem
allocator fix
Don't confuse an address with a pfn.
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
---
mm/sparse.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/sparse.c b/mm/sparse.c
index 2192b67..66d1845 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -288,7 +288,7 @@ sparse_early_usemaps_alloc_pgdat_section(struct pglist_data *pgdat,
* this problem.
*/
goal = __pa(pgdat) & PAGE_SECTION_MASK;
- host_pgdat = NODE_DATA(early_pfn_to_nid(goal));
+ host_pgdat = NODE_DATA(early_pfn_to_nid(goal >> PAGE_SHIFT));
printk("allocating usemap for node %d on node %d (goal=%lu)\n",
pgdat->node_id, host_pgdat->node_id, goal);
return __alloc_bootmem_node_nopanic(host_pgdat, size,
--
1.7.10.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>