Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753868AbYFPKdS (ORCPT ); Mon, 16 Jun 2008 06:33:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751415AbYFPKdK (ORCPT ); Mon, 16 Jun 2008 06:33:10 -0400 Received: from hellhawk.shadowen.org ([80.68.90.175]:4267 "EHLO hellhawk.shadowen.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbYFPKdJ (ORCPT ); Mon, 16 Jun 2008 06:33:09 -0400 Date: Mon, 16 Jun 2008 11:32:31 +0100 From: Andy Whitcroft To: Yasunori Goto Cc: Badari Pulavarty , Andrew Morton , Linux Kernel ML , linux-mm , Yinghai Lu Subject: Re: [Patch 003/005](memory hotplug) make alloc_bootmem_section() Message-ID: <20080616103231.GF17016@shadowen.org> References: <20080407213519.886E.E1E9C6FF@jp.fujitsu.com> <20080407214639.8876.E1E9C6FF@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080407214639.8876.E1E9C6FF@jp.fujitsu.com> User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2741 Lines: 80 On Mon, Apr 07, 2008 at 09:47:29PM +0900, Yasunori Goto wrote: > 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 > > --- > include/linux/bootmem.h | 2 ++ > mm/bootmem.c | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 33 insertions(+) > > Index: current/include/linux/bootmem.h > =================================================================== > --- current.orig/include/linux/bootmem.h 2008-04-07 19:18:44.000000000 +0900 > +++ current/include/linux/bootmem.h 2008-04-07 19:30:08.000000000 +0900 > @@ -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) \ > Index: current/mm/bootmem.c > =================================================================== > --- current.orig/mm/bootmem.c 2008-04-07 19:18:44.000000000 +0900 > +++ current/mm/bootmem.c 2008-04-07 19:30:08.000000000 +0900 > @@ -540,6 +540,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; > + This also indicates a failure allocating within the section, and yet we do not report it here. > + 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); But we do here. I think we should report both if this is worth reporting. > + ptr = NULL; > + } > + > + return ptr; > +} > +#endif > + > #ifndef ARCH_LOW_ADDRESS_LIMIT > #define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL > #endif -apw -- 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/