Commit bc02af93 authored by Yasunori Goto's avatar Yasunori Goto Committed by Linus Torvalds
Browse files

[PATCH] pgdat allocation for new node add (specify node id) 



Change the name of old add_memory() to arch_add_memory.  And use node id to
get pgdat for the node at NODE_DATA().

Note: Powerpc's old add_memory() is defined as __devinit. However,
      add_memory() is usually called only after bootup.
      I suppose it may be redundant. But, I'm not well known about powerpc.
      So, I keep it. (But, __meminit is better at least.)

Signed-off-by: default avatarYasunori Goto <y-goto@jp.fujitsu.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dd56a8e3

arch/i386/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ void __init mem_init(void) 
 */

#ifdef CONFIG_MEMORY_HOTPLUG

#ifndef CONFIG_NEED_MULTIPLE_NODES

int add_memory(u64 start, u64 size)

int arch_add_memory(int nid, u64 start, u64 size)

{

	struct pglist_data *pgdata = &contig_page_data;

	struct zone *zone = pgdata->node_zones + MAX_NR_ZONES-1;

arch/ia64/mm/init.c

+2 −3
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ void online_page(struct page *page) 
	num_physpages++;

}



int add_memory(u64 start, u64 size)

int arch_add_memory(int nid, u64 start, u64 size)

{

	pg_data_t *pgdat;

	struct zone *zone;
@@ -660,7 +660,7 @@ int add_memory(u64 start, u64 size) 
	unsigned long nr_pages = size >> PAGE_SHIFT;

	int ret;



	pgdat = NODE_DATA(0);

	pgdat = NODE_DATA(nid);



	zone = pgdat->node_zones + ZONE_NORMAL;

	ret = __add_pages(zone, start_pfn, nr_pages);
@@ -671,7 +671,6 @@ int add_memory(u64 start, u64 size) 


	return ret;

}

EXPORT_SYMBOL_GPL(add_memory);



int remove_memory(u64 start, u64 size)

{

arch/powerpc/mm/mem.c

+8 −3
Original line number Diff line number Diff line
@@ -114,15 +114,20 @@ void online_page(struct page *page) 
	num_physpages++;

}



int __devinit add_memory(u64 start, u64 size)

#ifdef CONFIG_NUMA

int memory_add_physaddr_to_nid(u64 start)

{

	return hot_add_scn_to_nid(start);

}

#endif



int __devinit arch_add_memory(int nid, u64 start, u64 size)

{

	struct pglist_data *pgdata;

	struct zone *zone;

	int nid;

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;



	nid = hot_add_scn_to_nid(start);

	pgdata = NODE_DATA(nid);



	start = (unsigned long)__va(start);

arch/x86_64/mm/init.c

+38 −28
Original line number Diff line number Diff line
@@ -506,8 +506,6 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size) 
/*

 * Memory hotplug specific functions

 */

#if defined(CONFIG_ACPI_HOTPLUG_MEMORY) || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)



void online_page(struct page *page)

{

	ClearPageReserved(page);
@@ -517,31 +515,17 @@ void online_page(struct page *page) 
	num_physpages++;

}



#ifndef CONFIG_MEMORY_HOTPLUG

#ifdef CONFIG_MEMORY_HOTPLUG

/*

 * Memory Hotadd without sparsemem. The mem_maps have been allocated in advance,

 * just online the pages.

 * XXX: memory_add_physaddr_to_nid() is to find node id from physical address

 *	via probe interface of sysfs. If acpi notifies hot-add event, then it

 *	can tell node id by searching dsdt. But, probe interface doesn't have

 *	node id. So, return 0 as node id at this time.

 */

int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)

#ifdef CONFIG_NUMA

int memory_add_physaddr_to_nid(u64 start)

{

	int err = -EIO;

	unsigned long pfn;

	unsigned long total = 0, mem = 0;

	for (pfn = start_pfn; pfn < start_pfn + nr_pages; pfn++) {

		if (pfn_valid(pfn)) {

			online_page(pfn_to_page(pfn));

			err = 0;

			mem++;

		}

		total++;

	}

	if (!err) {

		z->spanned_pages += total;

		z->present_pages += mem;

		z->zone_pgdat->node_spanned_pages += total;

		z->zone_pgdat->node_present_pages += mem;

	}

	return err;

	return 0;

}

#endif
@@ -549,9 +533,9 @@ int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages) 
 * Memory is added always to NORMAL zone. This means you will never get

 * additional DMA/DMA32 memory.

 */

int add_memory(u64 start, u64 size)

int arch_add_memory(int nid, u64 start, u64 size)

{

	struct pglist_data *pgdat = NODE_DATA(0);

	struct pglist_data *pgdat = NODE_DATA(nid);

	struct zone *zone = pgdat->node_zones + MAX_NR_ZONES-2;

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -568,7 +552,7 @@ error: 
	printk("%s: Problem encountered in __add_pages!\n", __func__);

	return ret;

}

EXPORT_SYMBOL_GPL(add_memory);

EXPORT_SYMBOL_GPL(arch_add_memory);



int remove_memory(u64 start, u64 size)

{
@@ -576,7 +560,33 @@ int remove_memory(u64 start, u64 size) 
}

EXPORT_SYMBOL_GPL(remove_memory);



#endif

#else /* CONFIG_MEMORY_HOTPLUG */

/*

 * Memory Hotadd without sparsemem. The mem_maps have been allocated in advance,

 * just online the pages.

 */

int __add_pages(struct zone *z, unsigned long start_pfn, unsigned long nr_pages)

{

	int err = -EIO;

	unsigned long pfn;

	unsigned long total = 0, mem = 0;

	for (pfn = start_pfn; pfn < start_pfn + nr_pages; pfn++) {

		if (pfn_valid(pfn)) {

			online_page(pfn_to_page(pfn));

			err = 0;

			mem++;

		}

		total++;

	}

	if (!err) {

		z->spanned_pages += total;

		z->present_pages += mem;

		z->zone_pgdat->node_spanned_pages += total;

		z->zone_pgdat->node_present_pages += mem;

	}

	return err;

}

#endif /* CONFIG_MEMORY_HOTPLUG */



static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,

			 kcore_vsyscall;

drivers/acpi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -328,7 +328,7 @@ config ACPI_CONTAINER 
config ACPI_HOTPLUG_MEMORY

	tristate "Memory Hotplug"

	depends on ACPI

	depends on MEMORY_HOTPLUG || X86_64

	depends on MEMORY_HOTPLUG

	default n

	help

	  This driver adds supports for ACPI Memory Hotplug.  This driver

CRA Git | Maintained and supported by SUSTech CRA and CCSE