Expost buffer_size in order to allow fair estimates on the actual space
used/needed.
Signed-off-by: Peter Zijlstra <[email protected]>
Cc: Pekka Enberg <[email protected]>
---
include/linux/slab.h | 2 ++
mm/slab.c | 16 ++++++++++++++--
mm/slob.c | 18 ++++++++++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
Index: linux-2.6-git/include/linux/slab.h
===================================================================
--- linux-2.6-git.orig/include/linux/slab.h 2007-03-26 14:18:59.000000000 +0200
+++ linux-2.6-git/include/linux/slab.h 2007-03-26 18:33:58.000000000 +0200
@@ -54,6 +54,7 @@ void *kmem_cache_alloc(struct kmem_cache
void *kmem_cache_zalloc(struct kmem_cache *, gfp_t);
void kmem_cache_free(struct kmem_cache *, void *);
unsigned int kmem_cache_size(struct kmem_cache *);
+unsigned int kmem_cache_objsize(struct kmem_cache *);
const char *kmem_cache_name(struct kmem_cache *);
int kmem_ptr_validate(struct kmem_cache *cachep, const void *ptr);
@@ -74,6 +75,7 @@ void *__kmalloc(size_t, gfp_t);
void *__kzalloc(size_t, gfp_t);
void kfree(const void *);
unsigned int ksize(const void *);
+unsigned int kobjsize(size_t);
/**
* kcalloc - allocate memory for an array. The memory is set to zero.
Index: linux-2.6-git/mm/slab.c
===================================================================
--- linux-2.6-git.orig/mm/slab.c 2007-03-26 15:44:34.000000000 +0200
+++ linux-2.6-git/mm/slab.c 2007-03-28 10:10:36.000000000 +0200
@@ -3205,12 +3205,12 @@ static inline void *____cache_alloc(stru
}
#ifdef CONFIG_SLAB_FAIR
-static inline int slab_alloc_rank(gfp_t flags)
+static __always_inline int slab_alloc_rank(gfp_t flags)
{
return gfp_to_rank(flags);
}
#else
-static inline int slab_alloc_rank(gfp_t flags)
+static __always_inline int slab_alloc_rank(gfp_t flags)
{
return 0;
}
@@ -3815,6 +3815,12 @@ unsigned int kmem_cache_size(struct kmem
}
EXPORT_SYMBOL(kmem_cache_size);
+unsigned int kmem_cache_objsize(struct kmem_cache *cachep)
+{
+ return cachep->buffer_size;
+}
+EXPORT_SYMBOL_GPL(kmem_cache_objsize);
+
const char *kmem_cache_name(struct kmem_cache *cachep)
{
return cachep->name;
@@ -4512,3 +4518,9 @@ unsigned int ksize(const void *objp)
return obj_size(virt_to_cache(objp));
}
+
+unsigned int kobjsize(size_t size)
+{
+ return kmem_cache_objsize(kmem_find_general_cachep(size, 0));
+}
+EXPORT_SYMBOL_GPL(kobjsize);
Index: linux-2.6-git/mm/slob.c
===================================================================
--- linux-2.6-git.orig/mm/slob.c 2007-03-26 14:18:59.000000000 +0200
+++ linux-2.6-git/mm/slob.c 2007-03-26 18:33:58.000000000 +0200
@@ -240,6 +240,15 @@ unsigned int ksize(const void *block)
return ((slob_t *)block - 1)->units * SLOB_UNIT;
}
+unsigned int kobjsize(size_t size)
+{
+ if (size < PAGE_SIZE)
+ return size;
+
+ return PAGE_SIZE << find_order(size);
+}
+EXPORT_SYMBOL_GPL(kobjsize);
+
struct kmem_cache {
unsigned int size, align;
const char *name;
@@ -321,6 +330,15 @@ unsigned int kmem_cache_size(struct kmem
}
EXPORT_SYMBOL(kmem_cache_size);
+unsigned int kmem_cache_objsize(struct kmem_cache *c)
+{
+ if (c->size < PAGE_SIZE)
+ return c->size + c->align;
+
+ return PAGE_SIZE << find_order(c->size);
+}
+EXPORT_SYMBOL_GPL(kmem_cache_objsize);
+
const char *kmem_cache_name(struct kmem_cache *c)
{
return c->name;
--
-
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]
