Re: [PATCH] memory hotplug: fix early allocation handling
From: Yasunori Goto
Date: Wed May 21 2008 - 03:39:47 EST
Looks good to me.
Thanks.
Acked-by: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
> From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
>
> Trying to add memory via add_memory() from within an initcall function
> results in
>
> bootmem alloc of 163840 bytes failed!
> Kernel panic - not syncing: Out of memory
>
> This is caused by zone_wait_table_init() which uses system_state to
> decide if it should use the bootmem allocator or not.
> When initcalls are handled the system_state is still SYSTEM_BOOTING
> but the bootmem allocator doesn't work anymore. So the allocation
> will fail.
>
> To fix this use slab_is_available() instead as indicator like we do
> it everywhere else.
>
> Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
> Cc: Dave Hansen <haveblue@xxxxxxxxxx>
> Cc: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx>
> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
> Cc: Yasunori Goto <y-goto@xxxxxxxxxxxxxx>
> Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
> ---
> mm/page_alloc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Index: linux-2.6/mm/page_alloc.c
> ===================================================================
> --- linux-2.6.orig/mm/page_alloc.c
> +++ linux-2.6/mm/page_alloc.c
> @@ -2804,7 +2804,7 @@ int zone_wait_table_init(struct zone *zo
> alloc_size = zone->wait_table_hash_nr_entries
> * sizeof(wait_queue_head_t);
>
> - if (system_state == SYSTEM_BOOTING) {
> + if (!slab_is_available()) {
> zone->wait_table = (wait_queue_head_t *)
> alloc_bootmem_node(pgdat, alloc_size);
> } else {
--
Yasunori Goto
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/