Messages in this thread | | | Date | Mon, 30 Oct 2006 09:53:31 +0000 | From | Andy Whitcroft <> | Subject | Re: Slab panic on 2.6.19-rc3-git5 (-git4 was OK) |
| |
Linus Torvalds wrote: > > On Sun, 29 Oct 2006, Martin J. Bligh wrote: >> Seems like that doesn't fix it, I'm afraid. > > Does the one in the current -git tree? It's commit > 5211e6e6c671f0d4b1e1a1023384d20227d8ee65, as below.. > > Linus
Submitted that commit, results in a couple of hours.
-apw
> > --- > commit 5211e6e6c671f0d4b1e1a1023384d20227d8ee65 > Author: Giridhar Pemmasani <pgiri@yahoo.com> > Date: Sun Oct 29 04:46:55 2006 -0800 > > [PATCH] Fix GFP_HIGHMEM slab panic > > As reported by Martin J. Bligh <mbligh@google.com>, we let through some > non-slab bits to slab allocation through __get_vm_area_node when doing a > vmalloc. > > I haven't been able to reproduce this, although I understand why it > happens: vmalloc allocates memory with > > GFP_KERNEL | __GFP_HIGHMEM > > and commit 52fd24ca1db3a741f144bbc229beefe044202cac resulted in the same > flags are passed down to cache_alloc_refill, causing the BUG. The > following patch fixes it. > > Note that when calling kmalloc_node, I am masking off __GFP_HIGHMEM with > GFP_LEVEL_MASK, whereas __vmalloc_area_node does the same with > > ~(__GFP_HIGHMEM | __GFP_ZERO). > > IMHO, using GFP_LEVEL_MASK is preferable, but either should fix this > problem. > > Signed-off-by: Giridhar Pemmasani (pgiri@yahoo.com) > Cc: Martin J. Bligh <mbligh@google.com> > Cc: Andrew Morton <akpm@osdl.org> > Signed-off-by: Linus Torvalds <torvalds@osdl.org> > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > index 6d381df..46606c1 100644 > --- a/mm/vmalloc.c > +++ b/mm/vmalloc.c > @@ -182,7 +182,7 @@ static struct vm_struct *__get_vm_area_n > addr = ALIGN(start, align); > size = PAGE_ALIGN(size); > > - area = kmalloc_node(sizeof(*area), gfp_mask, node); > + area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node); > if (unlikely(!area)) > return NULL; >
- 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/
| |