Commit de1af8f6 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds

radix tree test suite: add some more functionality

IDR needs more functionality from the kernel: kmalloc()/kfree(), and
xchg().

Link: http://lkml.kernel.org/r/1480369871-5271-67-git-send-email-mawilcox@linuxonhyperv.comSigned-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Tested-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Matthew Wilcox <mawilcox@microsoft.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 424251a4
...@@ -54,6 +54,21 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp) ...@@ -54,6 +54,21 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
free(objp); free(objp);
} }
void *kmalloc(size_t size, gfp_t gfp)
{
void *ret = malloc(size);
uatomic_inc(&nr_allocated);
return ret;
}
void kfree(void *p)
{
if (!p)
return;
uatomic_dec(&nr_allocated);
free(p);
}
struct kmem_cache * struct kmem_cache *
kmem_cache_create(const char *name, size_t size, size_t offset, kmem_cache_create(const char *name, size_t size, size_t offset,
unsigned long flags, void (*ctor)(void *)) unsigned long flags, void (*ctor)(void *))
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <limits.h> #include <limits.h>
#include "../../include/linux/compiler.h" #include "../../include/linux/compiler.h"
#include "../../include/linux/err.h"
#include "../../../include/linux/kconfig.h" #include "../../../include/linux/kconfig.h"
#ifdef BENCHMARK #ifdef BENCHMARK
...@@ -58,4 +59,6 @@ static inline int in_interrupt(void) ...@@ -58,4 +59,6 @@ static inline int in_interrupt(void)
#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1) #define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
#define round_down(x, y) ((x) & ~__round_mask(x, y)) #define round_down(x, y) ((x) & ~__round_mask(x, y))
#define xchg(ptr, x) uatomic_xchg(ptr, x)
#endif /* _KERNEL_H */ #endif /* _KERNEL_H */
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
#define SLAB_PANIC 2 #define SLAB_PANIC 2
#define SLAB_RECLAIM_ACCOUNT 0x00020000UL /* Objects are reclaimable */ #define SLAB_RECLAIM_ACCOUNT 0x00020000UL /* Objects are reclaimable */
void *kmalloc(size_t size, gfp_t);
void kfree(void *);
struct kmem_cache { struct kmem_cache {
int size; int size;
void (*ctor)(void *); void (*ctor)(void *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment