Re: [PATCH] slab: remove bootmem calling

[Pekka Enberg <penberg@cs.helsinki.fi>]

On Thu, 2009-05-28 at 18:18 -0700, Yinghai Lu wrote:
> Yinghai Lu wrote:
> > mem_init/kmem_cache_init is moved up
> > 
> > Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> > ---
> >  mm/page_cgroup.c |   12 ++++++++----
> >  1 file changed, 8 insertions(+), 4 deletions(-)
> > 
> > Index: linux-2.6/mm/page_cgroup.c
> > ===================================================================
> > --- linux-2.6.orig/mm/page_cgroup.c
> > +++ linux-2.6/mm/page_cgroup.c
> > @@ -47,6 +47,8 @@ static int __init alloc_node_page_cgroup
> >  	struct page_cgroup *base, *pc;
> >  	unsigned long table_size;
> >  	unsigned long start_pfn, nr_pages, index;
> > +	struct page *page;
> > +	unsigned int order;
> >  
> >  	start_pfn = NODE_DATA(nid)->node_start_pfn;
> >  	nr_pages = NODE_DATA(nid)->node_spanned_pages;
> > @@ -55,11 +57,13 @@ static int __init alloc_node_page_cgroup
> >  		return 0;
> >  
> >  	table_size = sizeof(struct page_cgroup) * nr_pages;
> > -
> > -	base = __alloc_bootmem_node_nopanic(NODE_DATA(nid),
> > -			table_size, PAGE_SIZE, __pa(MAX_DMA_ADDRESS));
> > -	if (!base)
> > +	order = get_order(table_size);
> > +	page = alloc_pages_node(nid, GFP_NOWAIT | __GFP_ZERO, order);
> > +	if (!page)
> > +		page = alloc_pages_node(-1, GFP_NOWAIT | __GFP_ZERO, order);
> > +	if (!page)
> >  		return -ENOMEM;
> > +	base = page_address(page);
> 
> any good way to replace __alloc_bootmem_node that could take alignment?

Not that I am aware of. Where do you need that? This one looks ok to me
as page allocator obviously returns PAGE_SIZE aligned chunks.

			Pekka