Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964947AbWCQI0v (ORCPT ); Fri, 17 Mar 2006 03:26:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S964928AbWCQIW5 (ORCPT ); Fri, 17 Mar 2006 03:22:57 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:41707 "EHLO fgwmail5.fujitsu.co.jp") by vger.kernel.org with ESMTP id S964937AbWCQIWr (ORCPT ); Fri, 17 Mar 2006 03:22:47 -0500 Date: Fri, 17 Mar 2006 17:22:06 +0900 From: Yasunori Goto To: Andrew Morton Subject: [PATCH: 009/017]Memory hotplug for new nodes v.4.(add return code init_currently_empty_zone) Cc: "Luck, Tony" , Andi Kleen , Linux Kernel ML , linux-ia64@vger.kernel.org, linux-mm X-Mailer-Plugin: BkASPil for Becky!2 Ver.2.063 Message-Id: <20060317163404.C649.Y-GOTO@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.24.02 [ja] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4246 Lines: 125 When add_zone() is called against empty zone (not populated zone), we have to initialize the zone which didn't initialize at boot time. But, init_currently_empty_zone() may fail due to allocation of wait table. So, this patch is to catch its error code. Changes against wait_table is in the next patch. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Yasunori Goto include/linux/mmzone.h | 3 +++ mm/memory_hotplug.c | 15 +++++++++++++-- mm/page_alloc.c | 11 ++++++++--- 3 files changed, 24 insertions(+), 5 deletions(-) Index: pgdat8/mm/page_alloc.c =================================================================== --- pgdat8.orig/mm/page_alloc.c 2006-03-16 16:05:38.000000000 +0900 +++ pgdat8/mm/page_alloc.c 2006-03-16 16:44:04.000000000 +0900 @@ -2111,8 +2111,9 @@ static __meminit void zone_pcp_init(stru zone->name, zone->present_pages, batch); } -static __meminit void init_currently_empty_zone(struct zone *zone, - unsigned long zone_start_pfn, unsigned long size) +__meminit int init_currently_empty_zone(struct zone *zone, + unsigned long zone_start_pfn, + unsigned long size) { struct pglist_data *pgdat = zone->zone_pgdat; @@ -2124,6 +2125,8 @@ static __meminit void init_currently_emp memmap_init(size, pgdat->node_id, zone_idx(zone), zone_start_pfn); zone_init_free_lists(pgdat, zone, zone->spanned_pages); + + return 0; } /* @@ -2138,6 +2141,7 @@ static void __init free_area_init_core(s unsigned long j; int nid = pgdat->node_id; unsigned long zone_start_pfn = pgdat->node_start_pfn; + int ret; pgdat_resize_init(pgdat); pgdat->nr_zones = 0; @@ -2179,7 +2183,8 @@ static void __init free_area_init_core(s continue; zonetable_add(zone, nid, j, zone_start_pfn, size); - init_currently_empty_zone(zone, zone_start_pfn, size); + ret = init_currently_empty_zone(zone, zone_start_pfn, size); + BUG_ON(ret); zone_start_pfn += size; } } Index: pgdat8/mm/memory_hotplug.c =================================================================== --- pgdat8.orig/mm/memory_hotplug.c 2006-03-16 16:05:38.000000000 +0900 +++ pgdat8/mm/memory_hotplug.c 2006-03-16 16:45:30.000000000 +0900 @@ -26,16 +26,23 @@ extern void zonetable_add(struct zone *zone, int nid, int zid, unsigned long pfn, unsigned long size); -static void __add_zone(struct zone *zone, unsigned long phys_start_pfn) +static int __add_zone(struct zone *zone, unsigned long phys_start_pfn) { struct pglist_data *pgdat = zone->zone_pgdat; int nr_pages = PAGES_PER_SECTION; int nid = pgdat->node_id; int zone_type; + int ret = 0; zone_type = zone - pgdat->node_zones; + if (!populated_zone(zone)) { + ret = init_currently_empty_zone(zone, phys_start_pfn, nr_pages); + if (ret < 0) + return ret; + } memmap_init_zone(nr_pages, nid, zone_type, phys_start_pfn); zonetable_add(zone, nid, zone_type, phys_start_pfn, nr_pages); + return 0; } extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn, @@ -50,7 +57,11 @@ static int __add_section(struct zone *zo if (ret < 0) return ret; - __add_zone(zone, phys_start_pfn); + ret = __add_zone(zone, phys_start_pfn); + + if (ret < 0) + return ret; + return register_new_memory(__pfn_to_section(phys_start_pfn)); } Index: pgdat8/include/linux/mmzone.h =================================================================== --- pgdat8.orig/include/linux/mmzone.h 2006-03-16 16:05:38.000000000 +0900 +++ pgdat8/include/linux/mmzone.h 2006-03-16 16:06:27.000000000 +0900 @@ -332,6 +332,9 @@ void wakeup_kswapd(struct zone *zone, in int zone_watermark_ok(struct zone *z, int order, unsigned long mark, int classzone_idx, int alloc_flags); +extern int init_currently_empty_zone(struct zone *zone, unsigned long start_pfn, + unsigned long size); + #ifdef CONFIG_HAVE_MEMORY_PRESENT void memory_present(int nid, unsigned long start, unsigned long end); #else -- Yasunori Goto - 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/