tools/testing/radix-tree: Add keme_cache_alloc_bulk() support

Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>

diff --git a/tools/testing/radix-tree/linux.c b/tools/testing/radix-tree/linux.c
index f32cc5eac77efec6aa16af93be9ff9576da48db0..f7fc20fff9197d883e13475d5d8cf67483ad18fc 100644 (file)
--- a/tools/testing/radix-tree/linux.c
+++ b/tools/testing/radix-tree/linux.c
@@ -101,6 +101,55 @@ void kmem_cache_free_bulk(struct kmem_cache *cachep, size_t size, void **list)
                kmem_cache_free(cachep, list[i]);
        }
 }
+int kmem_cache_alloc_bulk(struct kmem_cache *cachep, gfp_t gfp, size_t size,
+                         void **p)
+{
+       size_t i;
+       if (kmalloc_verbose)
+               printk("Bulk alloc %lu\n", size);
+
+       if (!(gfp & __GFP_DIRECT_RECLAIM) && cachep->non_kernel < size)
+               return 0;
+
+       if (!(gfp & __GFP_DIRECT_RECLAIM))
+               cachep->non_kernel-= size;
+
+       pthread_mutex_lock(&cachep->lock);
+       if (cachep->nr_objs >= size) {
+               struct radix_tree_node *node = cachep->objs;
+               for (i = 0; i < size; i++) {
+                       cachep->nr_objs--;
+                       cachep->objs = node->parent;
+                       p[i] = cachep->objs;
+               }
+               pthread_mutex_unlock(&cachep->lock);
+               node->parent = NULL;
+       } else {
+               pthread_mutex_unlock(&cachep->lock);
+               for (i = 0; i < size; i++) {
+                       if (cachep->align) {
+                               posix_memalign(&p[i], cachep->align,
+                                              cachep->size * size);
+                       } else {
+                               p[i] = malloc(cachep->size * size);
+                       }
+                       if (cachep->ctor)
+                               cachep->ctor(p[i]);
+                       else if (gfp & __GFP_ZERO)
+                               memset(p[i], 0, cachep->size);
+               }
+       }
+
+       for (i = 0; i < size; i++) {
+               uatomic_inc(&nr_allocated);
+               uatomic_inc(&nr_tallocated);
+               if (kmalloc_verbose)
+                       printf("Allocating %p from slab\n", p[i]);
+       }
+
+       return size;
+}
+
 
 void *kmalloc(size_t size, gfp_t gfp)
 {

diff --git a/tools/testing/radix-tree/linux/slab.h b/tools/testing/radix-tree/linux/slab.h
index caef779b30421b8df9ecf1c7e75172050392ea5c..42a8f4dd2a63a67d6deb0f457f5cf91c779b0aa1 100644 (file)
--- a/tools/testing/radix-tree/linux/slab.h
+++ b/tools/testing/radix-tree/linux/slab.h
@@ -24,4 +24,5 @@ struct kmem_cache *kmem_cache_create(const char *name, unsigned int size,
                        unsigned int align, unsigned int flags,
                        void (*ctor)(void *));
 void kmem_cache_free_bulk(struct kmem_cache *, size_t, void **);
+int kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **);
 #endif         /* SLAB_H */