mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-24 19:35:58 +00:00
Code Issues Releases Wiki Activity

[PATCH] wait_table and zonelist initializing for memory hotadd: add return code for init_current_empty_zone

Browse source 
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 <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Yasunori Goto 2006-06-23 02:03:10 -07:00 committed by Linus Torvalds
parent 86356ab147
commit 718127cc31
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/linux/mmzone.h
View file

@ -333,6 +333,9 @@ void wakeup_kswapd(struct zone *zone, int order);
int zone_watermark_ok(struct zone *z, int order, unsigned long mark, int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
int classzone_idx, int alloc_flags); 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 #ifdef CONFIG_HAVE_MEMORY_PRESENT
void memory_present(int nid, unsigned long start, unsigned long end); void memory_present(int nid, unsigned long start, unsigned long end);
#else #else

15
mm/memory_hotplug.c
View file

@ -26,7 +26,7 @@
extern void zonetable_add(struct zone *zone, int nid, int zid, unsigned long pfn, extern void zonetable_add(struct zone *zone, int nid, int zid, unsigned long pfn,
unsigned long size); 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; struct pglist_data *pgdat = zone->zone_pgdat;
int nr_pages = PAGES_PER_SECTION; int nr_pages = PAGES_PER_SECTION;
@ -34,8 +34,15 @@ static void __add_zone(struct zone *zone, unsigned long phys_start_pfn)
int zone_type; int zone_type;
zone_type = zone - pgdat->node_zones; zone_type = zone - pgdat->node_zones;
if (!populated_zone(zone)) {
int ret = 0;
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); memmap_init_zone(nr_pages, nid, zone_type, phys_start_pfn);
zonetable_add(zone, nid, zone_type, phys_start_pfn, nr_pages); 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, extern int sparse_add_one_section(struct zone *zone, unsigned long start_pfn,
@ -50,7 +57,11 @@ static int __add_section(struct zone *zone, unsigned long phys_start_pfn)
if (ret < 0) if (ret < 0)
return ret; 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)); return register_new_memory(__pfn_to_section(phys_start_pfn));
} }

11
mm/page_alloc.c
View file

@ -2050,8 +2050,9 @@ static __meminit void zone_pcp_init(struct zone *zone)
zone->name, zone->present_pages, batch); zone->name, zone->present_pages, batch);
} }
static __meminit void init_currently_empty_zone(struct zone *zone, __meminit int init_currently_empty_zone(struct zone *zone,
unsigned long zone_start_pfn, unsigned long size) unsigned long zone_start_pfn,
unsigned long size)
{ {
struct pglist_data *pgdat = zone->zone_pgdat; struct pglist_data *pgdat = zone->zone_pgdat;
@ -2063,6 +2064,8 @@ static __meminit void init_currently_empty_zone(struct zone *zone,
memmap_init(size, pgdat->node_id, zone_idx(zone), zone_start_pfn); memmap_init(size, pgdat->node_id, zone_idx(zone), zone_start_pfn);
zone_init_free_lists(pgdat, zone, zone->spanned_pages); zone_init_free_lists(pgdat, zone, zone->spanned_pages);
return 0;
} }
/* /*
@ -2077,6 +2080,7 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat,
unsigned long j; unsigned long j;
int nid = pgdat->node_id; int nid = pgdat->node_id;
unsigned long zone_start_pfn = pgdat->node_start_pfn; unsigned long zone_start_pfn = pgdat->node_start_pfn;
int ret;
pgdat_resize_init(pgdat); pgdat_resize_init(pgdat);
pgdat->nr_zones = 0; pgdat->nr_zones = 0;
@ -2118,7 +2122,8 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat,
continue; continue;
zonetable_add(zone, nid, j, zone_start_pfn, size); 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; zone_start_pfn += size;
} }
} }