diff options
| -rw-r--r-- | rpc/rpc-transport/rdma/src/rdma.c | 81 | ||||
| -rw-r--r-- | rpc/rpc-transport/rdma/src/rdma.h | 1 |
2 files changed, 62 insertions, 20 deletions
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c index 5fc6076f996..f62f40116f5 100644 --- a/rpc/rpc-transport/rdma/src/rdma.c +++ b/rpc/rpc-transport/rdma/src/rdma.c @@ -362,6 +362,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) @@ -434,20 +458,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, @@ -483,6 +501,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) { @@ -760,7 +788,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_log (this->name, GF_LOG_ERROR, @@ -4457,7 +4485,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_log (GF_RDMA_LOG_NAME, GF_LOG_WARNING, @@ -4768,12 +4796,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; } @@ -4803,12 +4839,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; } diff --git a/rpc/rpc-transport/rdma/src/rdma.h b/rpc/rpc-transport/rdma/src/rdma.h index 0a9fd35a0b1..cf4536dc9bd 100644 --- a/rpc/rpc-transport/rdma/src/rdma.h +++ b/rpc/rpc-transport/rdma/src/rdma.h @@ -345,6 +345,7 @@ struct __gf_rdma_ctx { gf_rdma_device_t *device; struct rdma_event_channel *rdma_cm_event_channel; pthread_t rdma_cm_thread; + pthread_mutex_t lock; int32_t dlcount; }; typedef struct __gf_rdma_ctx gf_rdma_ctx_t; |