[PATCH rdma-next] RDMA/restrack: Don't treat as an error allocation ID wrapping

[PATCH rdma-next] RDMA/restrack: Don't treat as an error allocation ID wrapping

[Leon Romanovsky]

From: Leon Romanovsky <leonro@nvidia.com>

xa_alloc_cyclic() call returns positive number if ID allocation
succeeded but wrapped. It is not an error, so normalize the "ret"
variable to zero as marker of not-an-error.

   drivers/infiniband/core/restrack.c:261 rdma_restrack_add()
   warn: 'ret' can be either negative or positive

Fixes: fd47c2f99f04 ("RDMA/restrack: Convert internal DB from hash to XArray")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
---
 drivers/infiniband/core/restrack.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/infiniband/core/restrack.c b/drivers/infiniband/core/restrack.c
index 53a8005972a8..5226ac0e0e07 100644
--- a/drivers/infiniband/core/restrack.c
+++ b/drivers/infiniband/core/restrack.c
@@ -257,6 +257,7 @@ int rdma_restrack_add(struct rdma_restrack_entry *res)
 	default:
 		ret = xa_alloc_cyclic(&rt->xa, &res->id, res, xa_limit_32b,
 				      &rt->next_id, GFP_KERNEL);
+		ret = (ret < 0) ? ret : 0;
 	}
 	if (ret) {
 		ibdev_err(
-- 
2.29.2

Re: [PATCH rdma-next] RDMA/restrack: Don't treat as an error allocation ID wrapping

[Jason Gunthorpe]

On Wed, Dec 16, 2020 at 12:07:53PM +0200, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@nvidia.com>
> 
> xa_alloc_cyclic() call returns positive number if ID allocation
> succeeded but wrapped. It is not an error, so normalize the "ret"
> variable to zero as marker of not-an-error.
> 
>    drivers/infiniband/core/restrack.c:261 rdma_restrack_add()
>    warn: 'ret' can be either negative or positive
> 
> Fixes: fd47c2f99f04 ("RDMA/restrack: Convert internal DB from hash to XArray")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
> ---
>  drivers/infiniband/core/restrack.c | 1 +
>  1 file changed, 1 insertion(+)

Applied to for-rc, thanks

Jason