memory hotplug: make alloc_bootmem_section()

alloc_bootmem_section() can allocate specified section's area. This is used for usemap to keep same section with pgdat by later patch. Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: Badari Pulavarty <pbadari@us.ibm.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com> Cc: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

memory hotplug: make alloc_bootmem_section()
alloc_bootmem_section() can allocate specified section's area. This is used for usemap to keep same section with pgdat by later patch. Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: Badari Pulavarty <pbadari@us.ibm.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com> Cc: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Yasunori Goto · Linus Torvalds
1 parent 9d99217a02
Showing 2 changed files with 33 additions and 0 deletions Side-by-side Diff
include/linux/bootmem.h
mm/bootmem.c
@@ -101,6 +101,8 @@
 extern void free_bootmem_node(pg_data_t *pgdat,
 			      unsigned long addr,
 			      unsigned long size);
+extern void *alloc_bootmem_section(unsigned long size,
+				   unsigned long section_nr);
  
 #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
 #define alloc_bootmem_node(pgdat, x) \
@@ -545,6 +545,37 @@
 	return __alloc_bootmem(size, align, goal);
 }
  
+#ifdef CONFIG_SPARSEMEM
+void * __init alloc_bootmem_section(unsigned long size,
+				    unsigned long section_nr)
+{
+	void *ptr;
+	unsigned long limit, goal, start_nr, end_nr, pfn;
+	struct pglist_data *pgdat;
+
+	pfn = section_nr_to_pfn(section_nr);
+	goal = PFN_PHYS(pfn);
+	limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1;
+	pgdat = NODE_DATA(early_pfn_to_nid(pfn));
+	ptr = __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal,
+				   limit);
+
+	if (!ptr)
+		return NULL;
+
+	start_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr)));
+	end_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr) + size));
+	if (start_nr != section_nr || end_nr != section_nr) {
+		printk(KERN_WARNING "alloc_bootmem failed on section %ld.\n",
+		       section_nr);
+		free_bootmem_core(pgdat->bdata, __pa(ptr), size);
+		ptr = NULL;
+	}
+
+	return ptr;
+}
+#endif
+
 #ifndef ARCH_LOW_ADDRESS_LIMIT
 #define ARCH_LOW_ADDRESS_LIMIT	0xffffffffUL
 #endif
...	...	@@ -101,6 +101,8 @@
101	101	extern void free_bootmem_node(pg_data_t *pgdat,
102	102	unsigned long addr,
103	103	unsigned long size);
	104	+extern void *alloc_bootmem_section(unsigned long size,
	105	+ unsigned long section_nr);
104	106
105	107	#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE
106	108	#define alloc_bootmem_node(pgdat, x) \
...	...	@@ -545,6 +545,37 @@
545	545	return __alloc_bootmem(size, align, goal);
546	546	}
547	547
	548	+#ifdef CONFIG_SPARSEMEM
	549	+void * __init alloc_bootmem_section(unsigned long size,
	550	+ unsigned long section_nr)
	551	+{
	552	+ void *ptr;
	553	+ unsigned long limit, goal, start_nr, end_nr, pfn;
	554	+ struct pglist_data *pgdat;
	555	+
	556	+ pfn = section_nr_to_pfn(section_nr);
	557	+ goal = PFN_PHYS(pfn);
	558	+ limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1;
	559	+ pgdat = NODE_DATA(early_pfn_to_nid(pfn));
	560	+ ptr = __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal,
	561	+ limit);
	562	+
	563	+ if (!ptr)
	564	+ return NULL;
	565	+
	566	+ start_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr)));
	567	+ end_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr) + size));
	568	+ if (start_nr != section_nr \|\| end_nr != section_nr) {
	569	+ printk(KERN_WARNING "alloc_bootmem failed on section %ld.\n",
	570	+ section_nr);
	571	+ free_bootmem_core(pgdat->bdata, __pa(ptr), size);
	572	+ ptr = NULL;
	573	+ }
	574	+
	575	+ return ptr;
	576	+}
	577	+#endif
	578	+
548	579	#ifndef ARCH_LOW_ADDRESS_LIMIT
549	580	#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
550	581	#endif