From: Christoph Lameter <cl@linux.com>
To: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: linux-mm@kvack.org, David Rientjes <rientjes@google.com>
Subject: [S+Q Core 4/6] slub: Remove MAX_OBJS limitation
Date: Fri, 20 Aug 2010 14:01:55 -0500 [thread overview]
Message-ID: <20100820190236.144574042@linux.com> (raw)
In-Reply-To: 20100820190151.493325014@linux.com
[-- Attachment #1: unified_unlimited --]
[-- Type: text/plain, Size: 2267 bytes --]
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 <cl@linux-foundation.org>
---
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2010-08-20 23:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-20 19:01 [S+Q Core 0/6] SLUB: Queueing Core Christoph Lameter
2010-08-20 19:01 ` [S+Q Core 1/6] slub: Add per cpu queueing Christoph Lameter
2010-08-20 19:01 ` [S+Q Core 2/6] slub: Allow resizing of per cpu queues Christoph Lameter
2010-08-20 19:01 ` [S+Q Core 3/6] slub: Get rid of useless function count_free() Christoph Lameter
2010-08-23 17:18 ` Pekka Enberg
2010-08-20 19:01 ` Christoph Lameter [this message]
2010-08-20 19:01 ` [S+Q Core 5/6] slub: Drop allocator announcement Christoph Lameter
2010-08-20 19:01 ` [S+Q Core 6/6] slub: Object based NUMA policies Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100820190236.144574042@linux.com \
--to=cl@linux.com \
--cc=linux-mm@kvack.org \
--cc=penberg@cs.helsinki.fi \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.