Instead of calling rdma_destroy_id() after waiting for the context completion
finished, call rdma_destroy_id() from inside the ucma_put_ctx() function.
This patch reduces the number of rdma_destroy_id() calls but does not change
the behavior of this code.
Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
---
drivers/infiniband/core/ucma.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 0274e9b704be..30c09864fd9e 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -160,8 +160,14 @@ static struct ucma_context *ucma_get_ctx(struct ucma_file *file, int id)
static void ucma_put_ctx(struct ucma_context *ctx)
{
- if (atomic_dec_and_test(&ctx->ref))
- complete(&ctx->comp);
+ if (!atomic_dec_and_test(&ctx->ref))
+ return;
+ /*
+ * rdma_destroy_id() ensures that no event handlers are inflight
+ * for that id before releasing it.
+ */
+ rdma_destroy_id(ctx->cm_id);
+ complete(&ctx->comp);
}
/*
@@ -199,8 +205,6 @@ static void ucma_close_id(struct work_struct *work)
*/
ucma_put_ctx(ctx);
wait_for_completion(&ctx->comp);
- /* No new events will be generated after destroying the id. */
- rdma_destroy_id(ctx->cm_id);
}
static struct ucma_context *ucma_alloc_ctx(struct ucma_file *file)
@@ -628,7 +632,6 @@ static ssize_t ucma_destroy_id(struct ucma_file *file, const char __user *inbuf,
xa_unlock(&ctx_table);
ucma_put_ctx(ctx);
wait_for_completion(&ctx->comp);
- rdma_destroy_id(ctx->cm_id);
} else {
xa_unlock(&ctx_table);
}
@@ -1756,10 +1759,6 @@ static int ucma_close(struct inode *inode, struct file *filp)
xa_unlock(&ctx_table);
ucma_put_ctx(ctx);
wait_for_completion(&ctx->comp);
- /* rdma_destroy_id ensures that no event handlers are
- * inflight for that id before releasing it.
- */
- rdma_destroy_id(ctx->cm_id);
} else {
xa_unlock(&ctx_table);
}
--
2.23.0.444.g18eeb5a265-goog
