Hi Matthew,
This untested patch adds kmem_cache_operations so we can have different
page allocation back-ends. The next patch uses this infrastructure to
implement mempool-backed object caches.
Signed-off-by: Pekka Enberg <[email protected]>
---
mm/slab.c | 31 +++++++++++++++++++++++++++++--
1 file changed, 29 insertions(+), 2 deletions(-)
Index: 2.6-mm/mm/slab.c
===================================================================
--- 2.6-mm.orig/mm/slab.c
+++ 2.6-mm/mm/slab.c
@@ -362,6 +362,11 @@ static void kmem_list3_init(struct kmem_
MAKE_LIST((cachep), (&(ptr)->slabs_free), slabs_free, nodeid); \
} while (0)
+struct kmem_cache_operations {
+ void* (*getpages)(struct kmem_cache *, gfp_t, int);
+ void (*freepages)(struct kmem_cache *, void *);
+};
+
/*
* struct kmem_cache
*
@@ -401,6 +406,8 @@ struct kmem_cache {
/* de-constructor func */
void (*dtor) (void *, struct kmem_cache *, unsigned long);
+ struct kmem_cache_operations *ops;
+
/* shrinker data for this cache */
struct shrinker *shrinker;
@@ -638,6 +645,8 @@ static struct arraycache_init initarray_
static struct arraycache_init initarray_generic =
{ {0, BOOT_CPUCACHE_ENTRIES, 1, 0} };
+static struct kmem_cache_operations pagealloc_ops;
+
/* internal cache of cache description objs */
static struct kmem_cache cache_cache = {
.batchcount = 1,
@@ -647,6 +656,7 @@ static struct kmem_cache cache_cache = {
.flags = SLAB_NO_REAP,
.spinlock = SPIN_LOCK_UNLOCKED,
.name = "kmem_cache",
+ .ops = &pagealloc_ops,
#if DEBUG
.obj_size = sizeof(struct kmem_cache),
#endif
@@ -1282,7 +1292,7 @@ static void *kmem_getpages(struct kmem_c
int i;
flags |= cachep->gfpflags;
- page = alloc_pages_node(nodeid, flags, cachep->gfporder);
+ page = cachep->ops->getpages(cachep, flags, nodeid);
if (!page)
return NULL;
addr = page_address(page);
@@ -1315,11 +1325,27 @@ static void kmem_freepages(struct kmem_c
sub_page_state(nr_slab, nr_freed);
if (current->reclaim_state)
current->reclaim_state->reclaimed_slab += nr_freed;
- free_pages((unsigned long)addr, cachep->gfporder);
+ cachep->ops->freepages(cachep, addr);
if (cachep->flags & SLAB_RECLAIM_ACCOUNT)
atomic_sub(1 << cachep->gfporder, &slab_reclaim_pages);
}
+static void *pagealloc_getpages(struct kmem_cache *cache, gfp_t flags,
+ int nodeid)
+{
+ return alloc_pages_node(nodeid, flags, cache->gfporder);
+}
+
+static void pagealloc_freepages(struct kmem_cache *cache, void *addr)
+{
+ free_pages((unsigned long)addr, cache->gfporder);
+}
+
+static struct kmem_cache_operations pagealloc_ops = {
+ .getpages = pagealloc_getpages,
+ .freepages = pagealloc_freepages
+};
+
static void kmem_rcu_free(struct rcu_head *head)
{
struct slab_rcu *slab_rcu = (struct slab_rcu *)head;
@@ -1784,6 +1810,7 @@ kmem_cache_create (const char *name, siz
goto oops;
memset(cachep, 0, sizeof(struct kmem_cache));
+ cachep->ops = &pagealloc_ops;
#if DEBUG
cachep->obj_size = size;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
