RDMA/ucma: Use refcount_t for the ctx->ref

Commit Message

Jason Gunthorpe Feb. 18, 2020, 7:17 p.m. UTC

Don't use an atomic as a refcount.

Signed-off-by: Jason Gunthorpe <[e-mail]>
---
 drivers/infiniband/core/ucma.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Leon Romanovsky Feb. 19, 2020, 7:16 a.m. UTC | #1

On Tue, Feb 18, 2020 at 07:17:00PM +0000, Jason Gunthorpe wrote:
> Don't use an atomic as a refcount.
>
> Signed-off-by: Jason Gunthorpe <[e-mail]>
> ---
>  drivers/infiniband/core/ucma.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>

Thanks,
Reviewed-by: Leon Romanovsky <[e-mail]>

Jason Gunthorpe Feb. 19, 2020, 8:41 p.m. UTC | #2

On Tue, Feb 18, 2020 at 07:17:00PM +0000, Jason Gunthorpe wrote:
> Don't use an atomic as a refcount.
> 
> Signed-off-by: Jason Gunthorpe <[e-mail]>
> Reviewed-by: Leon Romanovsky <[e-mail]>
> ---
>  drivers/infiniband/core/ucma.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Applied

Jason

Patch

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 57e68491a2fd6a..66ad29c672fce2 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -85,7 +85,7 @@  struct ucma_file {
 struct ucma_context {
 	u32			id;
 	struct completion	comp;
-	atomic_t		ref;
+	refcount_t		ref;
 	int			events_reported;
 	int			backlog;
 
@@ -152,7 +152,7 @@  static struct ucma_context *ucma_get_ctx(struct ucma_file *file, int id)
 		if (ctx->closing)
 			ctx = ERR_PTR(-EIO);
 		else
-			atomic_inc(&ctx->ref);
+			refcount_inc(&ctx->ref);
 	}
 	xa_unlock(&ctx_table);
 	return ctx;
@@ -160,7 +160,7 @@  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))
+	if (refcount_dec_and_test(&ctx->ref))
 		complete(&ctx->comp);
 }
 
@@ -212,7 +212,7 @@  static struct ucma_context *ucma_alloc_ctx(struct ucma_file *file)
 		return NULL;
 
 	INIT_WORK(&ctx->close_work, ucma_close_id);
-	atomic_set(&ctx->ref, 1);
+	refcount_set(&ctx->ref, 1);
 	init_completion(&ctx->comp);
 	INIT_LIST_HEAD(&ctx->mc_list);
 	ctx->file = file;
@@ -1502,7 +1502,7 @@  static ssize_t ucma_leave_multicast(struct ucma_file *file,
 		mc = ERR_PTR(-ENOENT);
 	else if (mc->ctx->file != file)
 		mc = ERR_PTR(-EINVAL);
-	else if (!atomic_inc_not_zero(&mc->ctx->ref))
+	else if (!refcount_inc_not_zero(&mc->ctx->ref))
 		mc = ERR_PTR(-ENXIO);
 	else
 		__xa_erase(&multicast_table, mc->id);