2022-06-09 07:22:11

by Dongliang Mu

Subject: [PATCH] rxe: fix xa_alloc_cycle() error return value check again

From: Dongliang Mu <[email protected]>

Currently rxe_alloc checks ret to indicate error, but 1 is also a valid
return and just indicates that the allocation succeeded with a wrap.

Fix this by modifying the check to be < 0.

Signed-off-by: Dongliang Mu <[email protected]>
---
drivers/infiniband/sw/rxe/rxe_pool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
index 1cc8e847ccff..e9f3bbd8d605 100644
--- a/drivers/infiniband/sw/rxe/rxe_pool.c
+++ b/drivers/infiniband/sw/rxe/rxe_pool.c
@@ -167,7 +167,7 @@ int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_elem *elem)

err = xa_alloc_cyclic(&pool->xa, &elem->index, elem, pool->limit,
&pool->next, GFP_KERNEL);
- if (err)
+ if (err < 0)
goto err_cnt;

return 0;
--
2.25.1

2022-06-16 09:14:24

by Leon Romanovsky

Subject: Re: [PATCH] rxe: fix xa_alloc_cycle() error return value check again

On Thu, Jun 09, 2022 at 03:06:56PM +0800, Dongliang Mu wrote:
> From: Dongliang Mu <[email protected]>
>
> Currently rxe_alloc checks ret to indicate error, but 1 is also a valid
> return and just indicates that the allocation succeeded with a wrap.
>
> Fix this by modifying the check to be < 0.
>
> Signed-off-by: Dongliang Mu <[email protected]>
> ---
> drivers/infiniband/sw/rxe/rxe_pool.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

I applied same fix to rxe_alloc() and added Fixes line.

Thanks, applied.

>
> diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
> index 1cc8e847ccff..e9f3bbd8d605 100644
> --- a/drivers/infiniband/sw/rxe/rxe_pool.c
> +++ b/drivers/infiniband/sw/rxe/rxe_pool.c
> @@ -167,7 +167,7 @@ int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_elem *elem)
>
> err = xa_alloc_cyclic(&pool->xa, &elem->index, elem, pool->limit,
> &pool->next, GFP_KERNEL);
> - if (err)
> + if (err < 0)
> goto err_cnt;
>
> return 0;
> --
> 2.25.1
>

2022-08-05 11:29:38

by William Kucharski

Subject: Re: [PATCH] rxe: fix xa_alloc_cycle() error return value check again

I erroneously sent a duplicate of this patch last week because I didn't see the fix in the 5.19 kernel as of yet.

Do we know when it might be pulled into Linus' tree?

Thanks,
William Kucharski

> On Jun 16, 2022, at 2:57 AM, Leon Romanovsky <[email protected]> wrote:
>
> On Thu, Jun 09, 2022 at 03:06:56PM +0800, Dongliang Mu wrote:
>> From: Dongliang Mu <[email protected]>
>>
>> Currently rxe_alloc checks ret to indicate error, but 1 is also a valid
>> return and just indicates that the allocation succeeded with a wrap.
>>
>> Fix this by modifying the check to be < 0.
>>
>> Signed-off-by: Dongliang Mu <[email protected]>
>> ---
>> drivers/infiniband/sw/rxe/rxe_pool.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> I applied same fix to rxe_alloc() and added Fixes line.
>
> Thanks, applied.
>
>>
>> diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c
>> index 1cc8e847ccff..e9f3bbd8d605 100644
>> --- a/drivers/infiniband/sw/rxe/rxe_pool.c
>> +++ b/drivers/infiniband/sw/rxe/rxe_pool.c
>> @@ -167,7 +167,7 @@ int __rxe_add_to_pool(struct rxe_pool *pool, struct rxe_pool_elem *elem)
>>
>> err = xa_alloc_cyclic(&pool->xa, &elem->index, elem, pool->limit,
>> &pool->next, GFP_KERNEL);
>> - if (err)
>> + if (err < 0)
>> goto err_cnt;
>>
>> return 0;
>> --
>> 2.25.1
>>

2022-08-05 12:46:56

by Jason Gunthorpe

Subject: Re: [PATCH] rxe: fix xa_alloc_cycle() error return value check again

On Fri, Aug 05, 2022 at 11:21:53AM +0000, William Kucharski wrote:
> I erroneously sent a duplicate of this patch last week because I didn't see the fix in the 5.19 kernel as of yet.
>
> Do we know when it might be pulled into Linus' tree?

Yesterday

Jason