From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758475AbYDBWvJ (ORCPT ); Wed, 2 Apr 2008 18:51:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756759AbYDBWu4 (ORCPT ); Wed, 2 Apr 2008 18:50:56 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:38629 "EHLO e32.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755653AbYDBWuz (ORCPT ); Wed, 2 Apr 2008 18:50:55 -0400 Subject: Re: [PATCH] mm: allocate usemap at first instead of mem_map in sparse_init From: Badari Pulavarty To: yhlu.kernel@gmail.com Cc: Andrew Morton , Ingo Molnar , michael@ellerman.id.au, Kamalesh Babulal , linuxppc-dev@ozlabs.org, Balbir Singh , kernel list In-Reply-To: <200804021525.48799.yhlu.kernel@gmail.com> References: <200804021525.48799.yhlu.kernel@gmail.com> Content-Type: text/plain Date: Wed, 02 Apr 2008 15:51:25 -0800 Message-Id: <1207180285.30407.45.camel@dyn9047017100.beaverton.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.0.4 (2.0.4-4) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2008-04-02 at 15:25 -0700, Yinghai Lu wrote: > [PATCH] mm: allocate usemap at first instead of mem_map in sparse_init > so try to allocate usemap at first altogether. > > Signed-off-by: Yinghai Lu > > diff --git a/mm/sparse.c b/mm/sparse.c > index d3cb085..782ebe5 100644 > --- a/mm/sparse.c > +++ b/mm/sparse.c > @@ -294,7 +294,7 @@ void __init sparse_init(void) > unsigned long pnum; > struct page *map; > unsigned long *usemap; > - struct page **section_map; > + unsigned long **usemap_map; > int size; > int node; > > @@ -305,27 +305,31 @@ void __init sparse_init(void) > * make next 2M slip to one more 2M later. > * then in big system, the memmory will have a lot hole... > * here try to allocate 2M pages continously. Comments are x86-64 specific. On ppc its 16MB chunks :( > + * > + * powerpc hope to sparse_init_one_section right after each > + * sparse_early_mem_map_alloc, so allocate usemap_map > + * at first. > */ > - size = sizeof(struct page *) * NR_MEM_SECTIONS; > - section_map = alloc_bootmem(size); > - if (!section_map) > - panic("can not allocate section_map\n"); > + size = sizeof(unsigned long *) * NR_MEM_SECTIONS; > + usemap_map = alloc_bootmem(size); > + if (!usemap_map) > + panic("can not allocate usemap_map\n"); > > for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) { > if (!present_section_nr(pnum)) > continue; > - section_map[pnum] = sparse_early_mem_map_alloc(pnum); > + usemap_map[pnum] = sparse_early_usemap_alloc(pnum); > } > > for (pnum = 0; pnum < NR_MEM_SECTIONS; pnum++) { > if (!present_section_nr(pnum)) > continue; > > - map = section_map[pnum]; > + map = sparse_early_mem_map_alloc(pnum); > if (!map) > continue; > > - usemap = sparse_early_usemap_alloc(pnum); > + usemap = usemap_map[pnum]; > if (!usemap) > continue; You may want to move this check before doing sparse_early_mem_map_alloc (). We are also not handling errors properly (freeing up the unused map or usemap) if we "continue". I know the original code is this way, but you touched it last :) > > @@ -333,7 +337,7 @@ void __init sparse_init(void) > usemap); > } > > - free_bootmem(__pa(section_map), size); > + free_bootmem(__pa(usemap_map), size); > } > > #ifdef CONFIG_MEMORY_HOTPLUG Tested and boots my machine fine. Acked-by: Badari Pulavarty Thanks, Badari