Re: Next April 28: boot failure on PowerPC with SLQB

Pekka Enberg
2009-04-30T10:38:20Z

On Thu, 2009-04-30 at 12:35 +0200, Nick Piggin wrote:
> On Thu, Apr 30, 2009 at 03:17:12PM +0530, Sachin Sant wrote:
> > Nick Piggin wrote:
> > >Hmm, forget that. Actually my last patch had a silly mistake because I
> > >forgot MAX_ORDER shift is applied to PAGE_SIZE, rather than 1. So
> > >kmalloc(PAGE_SIZE) was failing as too large.
> > >
> > >This patch should do the trick I hope.
> > >
> > Yes this patch fixed the issue for me. Thanks Nick.
>
> Thanks very much for reporting and testing.
>
> Pekka, can you apply this patch please?

Sure. Sachin, can I add a "Reported-by" and "Tested-by" tags from you to
the patch description?

Stephen, does this patch fix all the boot problems for you as well?

> --
> SLQB: fix slab calculation
>
> SLQB didn't consider MAX_ORDER when defining which sizes of kmalloc
> slabs to create. It panics at boot if it tries to create a cache
> which exceeds MAX_ORDER-1.

Nit: this _really_ needs a pointer to the discussion or bit more details
on the issue. But I can fix that when I merge the patch.

>
> Signed-off-by: Nick Piggin <npiggin@suse.de>
> ---
> include/linux/slqb_def.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> Index: linux-2.6/include/linux/slqb_def.h
> ===================================================================
> --- linux-2.6.orig/include/linux/slqb_def.h
> +++ linux-2.6/include/linux/slqb_def.h
> @@ -172,7 +172,8 @@ struct kmem_cache {
> #endif
>
> #define KMALLOC_SHIFT_LOW ilog2(KMALLOC_MIN_SIZE)
> -#define KMALLOC_SHIFT_SLQB_HIGH (PAGE_SHIFT + 9)
> +#define KMALLOC_SHIFT_SLQB_HIGH (PAGE_SHIFT + \
> + ((9 <= (MAX_ORDER - 1)) ? 9 : (MAX_ORDER - 1)))
>
> extern struct kmem_cache kmalloc_caches[KMALLOC_SHIFT_SLQB_HIGH + 1];
> extern struct kmem_cache kmalloc_caches_dma[KMALLOC_SHIFT_SLQB_HIGH + 1];