From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail202.messagelabs.com (mail202.messagelabs.com [216.82.254.227]) by kanga.kvack.org (Postfix) with SMTP id A1C8C6B0366 for ; Fri, 20 Aug 2010 19:56:03 -0400 (EDT) Message-Id: <20100820190236.144574042@linux.com> Date: Fri, 20 Aug 2010 14:01:55 -0500 From: Christoph Lameter Subject: [S+Q Core 4/6] slub: Remove MAX_OBJS limitation References: <20100820190151.493325014@linux.com> Content-Disposition: inline; filename=unified_unlimited Sender: owner-linux-mm@kvack.org To: Pekka Enberg Cc: linux-mm@kvack.org, David Rientjes List-ID: There is no need anymore for the "inuse" field in the page struct. Extend the objects field to 32 bit allowing a practically unlimited number of objects. Signed-off-by: Christoph Lameter --- include/linux/mm_types.h | 5 +---- mm/slub.c | 7 ------- 2 files changed, 1 insertion(+), 11 deletions(-) Index: linux-2.6/include/linux/mm_types.h =================================================================== --- linux-2.6.orig/include/linux/mm_types.h 2010-08-19 16:31:50.000000000 -0500 +++ linux-2.6/include/linux/mm_types.h 2010-08-19 16:34:26.000000000 -0500 @@ -40,10 +40,7 @@ struct page { * to show when page is mapped * & limit reverse map searches. */ - struct { /* SLUB */ - u16 inuse; - u16 objects; - }; + u32 objects; /* SLUB */ }; union { struct { Index: linux-2.6/mm/slub.c =================================================================== --- linux-2.6.orig/mm/slub.c 2010-08-19 16:34:23.000000000 -0500 +++ linux-2.6/mm/slub.c 2010-08-19 16:34:26.000000000 -0500 @@ -143,7 +143,6 @@ static inline int kmem_cache_debug(struc #define OO_SHIFT 16 #define OO_MASK ((1 << OO_SHIFT) - 1) -#define MAX_OBJS_PER_PAGE 65535 /* since page.objects is u16 */ /* Internal SLUB flags */ #define __OBJECT_POISON 0x80000000UL /* Poison object */ @@ -789,9 +788,6 @@ static int verify_slab(struct kmem_cache max_objects = ((void *)page->freelist - start) / s->size; } - if (max_objects > MAX_OBJS_PER_PAGE) - max_objects = MAX_OBJS_PER_PAGE; - if (page->objects != max_objects) { slab_err(s, page, "Wrong number of objects. Found %d but " "should be %d", page->objects, max_objects); @@ -2055,9 +2051,6 @@ static inline int slab_order(int size, i int rem; int min_order = slub_min_order; - if ((PAGE_SIZE << min_order) / size > MAX_OBJS_PER_PAGE) - return get_order(size * MAX_OBJS_PER_PAGE) - 1; - for (order = max(min_order, fls(min_objects * size - 1) - PAGE_SHIFT); order <= max_order; order++) { -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org