> On 6 Jul 2021, at 07:48, Zhu Yanjun <zyjzyj2000@xxxxxxxxx> wrote:
>
> On Tue, Jul 6, 2021 at 12:42 AM Bob Pearson <rpearsonhpe@xxxxxxxxx> wrote:
>>
>> In rxe_mr_init_user() in rxe_mr.c at the third error the driver fails to
>> free the memory at mr->map. This patch adds code to do that.
>> This error only occurs if page_address() fails to return a non zero address
>> which should never happen for 64 bit architectures.
>>
>> Fixes: 8700e3e7c485 ("Soft RoCE driver")
>> Reported by: Haakon Bugge <haakon.bugge@xxxxxxxxxx>
>> Signed-off-by: Bob Pearson <rpearsonhpe@xxxxxxxxx>
>
> Thanks a lot.
>
> Reviewed-by: Zhu Yanjun <zyjzyj2000@xxxxxxxxx>
Reviewed-by: Håkon Bugge <haakon.bugge@xxxxxxxxxx>
Thxs, Håkon
> Zhu Yanjun
>
>> ---
>> v2:
>> Left out white space changes.
>>
>> drivers/infiniband/sw/rxe/rxe_mr.c | 27 +++++++++++++++++----------
>> 1 file changed, 17 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c
>> index 6aabcb4de235..be4bcb420fab 100644
>> --- a/drivers/infiniband/sw/rxe/rxe_mr.c
>> +++ b/drivers/infiniband/sw/rxe/rxe_mr.c
>> @@ -113,13 +113,14 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
>> int num_buf;
>> void *vaddr;
>> int err;
>> + int i;
>
> Thanks.
>
>>
>> umem = ib_umem_get(pd->ibpd.device, start, length, access);
>> if (IS_ERR(umem)) {
>> - pr_warn("err %d from rxe_umem_get\n",
>> - (int)PTR_ERR(umem));
>> + pr_warn("%s: Unable to pin memory region err = %d\n",
>> + __func__, (int)PTR_ERR(umem));
>> err = PTR_ERR(umem);
>> - goto err1;
>> + goto err_out;
>> }
>>
>> mr->umem = umem;
>> @@ -129,9 +130,9 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
>>
>> err = rxe_mr_alloc(mr, num_buf);
>> if (err) {
>> - pr_warn("err %d from rxe_mr_alloc\n", err);
>> - ib_umem_release(umem);
>> - goto err1;
>> + pr_warn("%s: Unable to allocate memory for map\n",
>> + __func__);
>> + goto err_release_umem;
>> }
>>
>> mr->page_shift = PAGE_SHIFT;
>> @@ -151,10 +152,10 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
>>
>> vaddr = page_address(sg_page_iter_page(&sg_iter));
>> if (!vaddr) {
>> - pr_warn("null vaddr\n");
>> - ib_umem_release(umem);
>> + pr_warn("%s: Unable to get virtual address\n",
>> + __func__);
>> err = -ENOMEM;
>> - goto err1;
>> + goto err_cleanup_map;
>> }
>>
>> buf->addr = (uintptr_t)vaddr;
>> @@ -177,7 +178,13 @@ int rxe_mr_init_user(struct rxe_pd *pd, u64 start, u64 length, u64 iova,
>>
>> return 0;
>>
>> -err1:
>> +err_cleanup_map:
>> + for (i = 0; i < mr->num_map; i++)
>> + kfree(mr->map[i]);
>> + kfree(mr->map);
>> +err_release_umem:
>> + ib_umem_release(umem);
>> +err_out:
>> return err;
>> }
>>
>> --
>> 2.30.2
