lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rbd: allocate image requests with a slab allocator

Browse Source 
Create a slab cache to manage rbd_img_request allocation.  Nothing
too fancy at this point--we'll still initialize everything at
allocation time (no constructor)

This is part of:
    http://tracker.ceph.com/issues/3926

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder
2013-05-01 12:43:03 -05:00
parent 30d1cff817
commit 1c2a9dfe21
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/block/rbd.c
View File

@@ -40,6 +40,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/slab.h>
#include "rbd_types.h" #include "rbd_types.h"
@@ -344,6 +345,8 @@ static DEFINE_SPINLOCK(rbd_dev_list_lock);
static LIST_HEAD(rbd_client_list); /* clients */ static LIST_HEAD(rbd_client_list); /* clients */
static DEFINE_SPINLOCK(rbd_client_list_lock); static DEFINE_SPINLOCK(rbd_client_list_lock);
static struct kmem_cache *rbd_img_request_cache;
static int rbd_img_request_submit(struct rbd_img_request *img_request); static int rbd_img_request_submit(struct rbd_img_request *img_request);
static void rbd_dev_device_release(struct device *dev); static void rbd_dev_device_release(struct device *dev);
@@ -1821,7 +1824,7 @@ static struct rbd_img_request *rbd_img_request_create(
{ {
struct rbd_img_request *img_request; struct rbd_img_request *img_request;
img_request = kmalloc(sizeof (*img_request), GFP_ATOMIC); img_request = kmem_cache_alloc(rbd_img_request_cache, GFP_ATOMIC);
if (!img_request) if (!img_request)
return NULL; return NULL;
@@ -1884,7 +1887,7 @@ static void rbd_img_request_destroy(struct kref *kref)
if (img_request_child_test(img_request)) if (img_request_child_test(img_request))
rbd_obj_request_put(img_request->obj_request); rbd_obj_request_put(img_request->obj_request);
kfree(img_request); kmem_cache_free(rbd_img_request_cache, img_request);
} }
static bool rbd_img_obj_end_request(struct rbd_obj_request *obj_request) static bool rbd_img_obj_end_request(struct rbd_obj_request *obj_request)
@@ -4992,6 +4995,26 @@ static void rbd_sysfs_cleanup(void)
device_unregister(&rbd_root_dev); device_unregister(&rbd_root_dev);
} }
static int rbd_slab_init(void)
{
rbd_assert(!rbd_img_request_cache);
rbd_img_request_cache = kmem_cache_create("rbd_img_request",
sizeof (struct rbd_img_request),
__alignof__(struct rbd_img_request),
0, NULL);
if (rbd_img_request_cache)
return 0;
return -ENOMEM;
}
static void rbd_slab_exit(void)
{
rbd_assert(rbd_img_request_cache);
kmem_cache_destroy(rbd_img_request_cache);
rbd_img_request_cache = NULL;
}
static int __init rbd_init(void) static int __init rbd_init(void)
{ {
int rc; int rc;
@@ -5001,16 +5024,22 @@ static int __init rbd_init(void)
return -EINVAL; return -EINVAL;
} }
rc = rbd_sysfs_init(); rc = rbd_slab_init();
if (rc) if (rc)
return rc; return rc;
rc = rbd_sysfs_init();
if (rc)
rbd_slab_exit();
else
pr_info("loaded " RBD_DRV_NAME_LONG "\n"); pr_info("loaded " RBD_DRV_NAME_LONG "\n");
return 0;
return rc;
} }
static void __exit rbd_exit(void) static void __exit rbd_exit(void)
{ {
rbd_sysfs_cleanup(); rbd_sysfs_cleanup();
rbd_slab_exit();
} }
module_init(rbd_init); module_init(rbd_init);