AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-27 05:10:51 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

radix tree test suite: cache recently freed objects

Browse Source 
The kmem_cache_alloc implementation simply allocates new memory from
malloc() and calls the ctor, which zeroes out the entire object.  This
means it cannot spot bugs where the object isn't properly reinitialised
before being freed.

Add a small (11 objects) cache before freeing objects back to malloc.
This is enough to let us write a test to catch it, although the memory
allocator is now aware of the structure of the radix tree node, since it
chains free objects through ->private_data (like the percpu cache does).

Link: http://lkml.kernel.org/r/1481667692-14500-2-git-send-email-mawilcox@linuxonhyperv.com
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Wilcox 2016-12-14 15:09:28 -08:00 committed by Linus Torvalds
parent de1af8f62a
commit bbe9d71f2c
2 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tools/testing/radix-tree/linux.c
View File

@ -1,16 +1,27 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <malloc.h> #include <malloc.h>
#include <pthread.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h> #include <assert.h>
#include <linux/mempool.h> #include <linux/mempool.h>
#include <linux/poison.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/radix-tree.h>
#include <urcu/uatomic.h> #include <urcu/uatomic.h>
int nr_allocated; int nr_allocated;
int preempt_count; int preempt_count;
struct kmem_cache {
pthread_mutex_t lock;
int size;
int nr_objs;
void *objs;
void (*ctor)(void *);
};
void *mempool_alloc(mempool_t *pool, int gfp_mask) void *mempool_alloc(mempool_t *pool, int gfp_mask)
{ {
return pool->alloc(gfp_mask, pool->data); return pool->alloc(gfp_mask, pool->data);
@ -34,24 +45,44 @@ mempool_t *mempool_create(int min_nr, mempool_alloc_t *alloc_fn,
void *kmem_cache_alloc(struct kmem_cache *cachep, int flags) void *kmem_cache_alloc(struct kmem_cache *cachep, int flags)
{ {
void *ret; struct radix_tree_node *node;
if (flags & __GFP_NOWARN) if (flags & __GFP_NOWARN)
return NULL; return NULL;
ret = malloc(cachep->size); pthread_mutex_lock(&cachep->lock);
if (cachep->ctor) if (cachep->nr_objs) {
cachep->ctor(ret); cachep->nr_objs--;
node = cachep->objs;
cachep->objs = node->private_data;
pthread_mutex_unlock(&cachep->lock);
node->private_data = NULL;
} else {
pthread_mutex_unlock(&cachep->lock);
node = malloc(cachep->size);
if (cachep->ctor)
cachep->ctor(node);
}
uatomic_inc(&nr_allocated); uatomic_inc(&nr_allocated);
return ret; return node;
} }
void kmem_cache_free(struct kmem_cache *cachep, void *objp) void kmem_cache_free(struct kmem_cache *cachep, void *objp)
{ {
assert(objp); assert(objp);
uatomic_dec(&nr_allocated); uatomic_dec(&nr_allocated);
memset(objp, 0, cachep->size); pthread_mutex_lock(&cachep->lock);
free(objp); if (cachep->nr_objs > 10) {
memset(objp, POISON_FREE, cachep->size);
free(objp);
} else {
struct radix_tree_node *node = objp;
cachep->nr_objs++;
node->private_data = cachep->objs;
cachep->objs = node;
}
pthread_mutex_unlock(&cachep->lock);
} }
void *kmalloc(size_t size, gfp_t gfp) void *kmalloc(size_t size, gfp_t gfp)
@ -75,7 +106,10 @@ kmem_cache_create(const char *name, size_t size, size_t offset,
{ {
struct kmem_cache *ret = malloc(sizeof(*ret)); struct kmem_cache *ret = malloc(sizeof(*ret));
pthread_mutex_init(&ret->lock, NULL);
ret->size = size; ret->size = size;
ret->nr_objs = 0;
ret->objs = NULL;
ret->ctor = ctor; ret->ctor = ctor;
return ret; return ret;
} }

5
tools/testing/radix-tree/linux/slab.h
View File

@ -10,11 +10,6 @@
void *kmalloc(size_t size, gfp_t); void *kmalloc(size_t size, gfp_t);
void kfree(void *); void kfree(void *);
struct kmem_cache {
int size;
void (*ctor)(void *);
};
void *kmem_cache_alloc(struct kmem_cache *cachep, int flags); void *kmem_cache_alloc(struct kmem_cache *cachep, int flags);
void kmem_cache_free(struct kmem_cache *cachep, void *objp); void kmem_cache_free(struct kmem_cache *cachep, void *objp);