summaryrefslogtreecommitdiffstats
path: root/rpc/rpc-transport/rdma/src/rdma.c
diff options
context:
space:
mode:
authorMohammed Rafi KC <rkavunga@redhat.com>2015-03-11 12:20:38 +0530
committerVijay Bellur <vbellur@redhat.com>2015-05-05 06:15:16 -0700
commitcfa6c85334fd62175aa114d779873b6790d6db8a (patch)
treeabf63d4811c17718a9d60b1a83d7f5ca13401058 /rpc/rpc-transport/rdma/src/rdma.c
parentf4679a70d87a4ed1564d82c34742fe2817b33ff7 (diff)
rdma:properly handle iobuf_pool when rdma transport is unloaded
We are registering iobuf_pool with rdma. When rdma transport is unloaded, we need to deregister all the buffers registered with rdma. Otherwise iobuf_arena destroy will fail. Also if rdma.so is loaded again, then register iobuf_pool with rdma Change-Id: Ic197721a44ba11dce41e03058e0a73901248c541 BUG: 1200704 Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> Reviewed-on: http://review.gluster.org/9854 Tested-by: NetBSD Build System Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Diffstat (limited to 'rpc/rpc-transport/rdma/src/rdma.c')
-rw-r--r--rpc/rpc-transport/rdma/src/rdma.c81
1 files changed, 61 insertions, 20 deletions
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
index 5a8a788..89fb6cb 100644
--- a/rpc/rpc-transport/rdma/src/rdma.c
+++ b/rpc/rpc-transport/rdma/src/rdma.c
@@ -366,6 +366,30 @@ gf_rdma_post_recv (struct ibv_srq *srq,
return ibv_post_srq_recv (srq, &wr, &bad_wr);
}
+static void
+gf_rdma_deregister_iobuf_pool (gf_rdma_device_t *device)
+{
+
+ gf_rdma_arena_mr *arena_mr = NULL;
+ gf_rdma_arena_mr *tmp = NULL;
+
+ while (device) {
+ if (!list_empty(&device->all_mr)) {
+ list_for_each_entry_safe (arena_mr, tmp,
+ &device->all_mr, list) {
+ if (ibv_dereg_mr(arena_mr->mr)) {
+ gf_log ("rdma", GF_LOG_WARNING,
+ "deallocation of memory region "
+ "failed");
+ return;
+ }
+ list_del(&arena_mr->list);
+ GF_FREE(arena_mr);
+ }
+ }
+ device = device->next;
+ }
+}
int
gf_rdma_deregister_arena (struct list_head **mr_list,
struct iobuf_arena *iobuf_arena)
@@ -442,20 +466,14 @@ gf_rdma_register_arena (void **arg1, void *arg2)
}
static void
-gf_rdma_register_iobuf_pool (rpc_transport_t *this)
+gf_rdma_register_iobuf_pool (gf_rdma_device_t *device,
+ struct iobuf_pool *iobuf_pool)
{
- struct iobuf_pool *iobuf_pool = NULL;
struct iobuf_arena *tmp = NULL;
struct iobuf_arena *dummy = NULL;
- gf_rdma_private_t *priv = NULL;
- gf_rdma_device_t *device = NULL;
struct ibv_mr *mr = NULL;
gf_rdma_arena_mr *new = NULL;
- priv = this->private;
- device = priv->device;
- iobuf_pool = this->ctx->iobuf_pool;
-
if (!list_empty(&iobuf_pool->all_arenas)) {
list_for_each_entry_safe (tmp, dummy, &iobuf_pool->all_arenas,
@@ -494,6 +512,16 @@ gf_rdma_register_iobuf_pool (rpc_transport_t *this)
return;
}
+static void
+gf_rdma_register_iobuf_pool_with_device (gf_rdma_device_t *device,
+ struct iobuf_pool *iobuf_pool)
+{
+ while (device) {
+ gf_rdma_register_iobuf_pool (device, iobuf_pool);
+ device = device->next;
+ }
+}
+
static struct ibv_mr*
gf_rdma_get_pre_registred_mr(rpc_transport_t *this, void *ptr, int size)
{
@@ -780,7 +808,7 @@ gf_rdma_get_device (rpc_transport_t *this, struct ibv_context *ibctx,
gf_rdma_queue_init (&trav->recvq);
INIT_LIST_HEAD (&trav->all_mr);
- gf_rdma_register_iobuf_pool(this);
+ gf_rdma_register_iobuf_pool(trav, iobuf_pool);
if (gf_rdma_create_posts (this) < 0) {
gf_msg (this->name, GF_LOG_ERROR, 0,
@@ -4559,7 +4587,7 @@ __gf_rdma_ctx_create (void)
if (rdma_ctx == NULL) {
goto out;
}
-
+ pthread_mutex_init (&rdma_ctx->lock, NULL);
rdma_ctx->rdma_cm_event_channel = rdma_create_event_channel ();
if (rdma_ctx->rdma_cm_event_channel == NULL) {
gf_msg (GF_RDMA_LOG_NAME, GF_LOG_WARNING, errno,
@@ -4878,12 +4906,20 @@ init (rpc_transport_t *this)
return -1;
}
rdma_ctx = this->ctx->ib;
- if (rdma_ctx != NULL) {
- rdma_ctx->dlcount++;
+ pthread_mutex_lock (&rdma_ctx->lock);
+ {
+ if (rdma_ctx != NULL) {
+ if (this->dl_handle && (++(rdma_ctx->dlcount)) == 1) {
+ iobuf_pool = this->ctx->iobuf_pool;
+ iobuf_pool->rdma_registration = gf_rdma_register_arena;
+ iobuf_pool->rdma_deregistration =
+ gf_rdma_deregister_arena;
+ gf_rdma_register_iobuf_pool_with_device
+ (rdma_ctx->device, iobuf_pool);
+ }
+ }
}
- iobuf_pool = this->ctx->iobuf_pool;
- iobuf_pool->rdma_registration = gf_rdma_register_arena;
- iobuf_pool->rdma_deregistration = gf_rdma_deregister_arena;
+ pthread_mutex_unlock (&rdma_ctx->lock);
return 0;
}
@@ -4913,12 +4949,17 @@ fini (struct rpc_transport *this)
if (!rdma_ctx)
return;
- rdma_ctx->dlcount--;
- if (rdma_ctx->dlcount == 0) {
- iobuf_pool = this->ctx->iobuf_pool;
- iobuf_pool->rdma_registration = NULL;
- iobuf_pool->rdma_deregistration = NULL;
+ pthread_mutex_lock (&rdma_ctx->lock);
+ {
+ if (this->dl_handle && (--(rdma_ctx->dlcount)) == 0) {
+ iobuf_pool = this->ctx->iobuf_pool;
+ gf_rdma_deregister_iobuf_pool (rdma_ctx->device);
+ iobuf_pool->rdma_registration = NULL;
+ iobuf_pool->rdma_deregistration = NULL;
+ }
}
+ pthread_mutex_unlock (&rdma_ctx->lock);
+
return;
}