2018-05-13 07:01:15

by Christophe JAILLET

[permalink] [raw]
Subject: [PATCH v2] {net, IB}/mlx5: Use 'kvfree()' for memory allocated by 'kvzalloc()'

When 'kvzalloc()' is used to allocate memory, 'kvfree()' must be used to
free it.

Signed-off-by: Christophe JAILLET <[email protected]>
---
v1 -> v2: More places to update have been added to the patch
---
drivers/infiniband/hw/mlx5/cq.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/vport.c | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
index 77d257ec899b..6d52ea03574e 100644
--- a/drivers/infiniband/hw/mlx5/cq.c
+++ b/drivers/infiniband/hw/mlx5/cq.c
@@ -849,7 +849,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
return 0;

err_cqb:
- kfree(*cqb);
+ kvfree(*cqb);

err_db:
mlx5_ib_db_unmap_user(to_mucontext(context), &cq->db);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 35e256eb2f6e..b123f8a52ad8 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -663,7 +663,7 @@ static int esw_create_vport_rx_group(struct mlx5_eswitch *esw)

esw->offloads.vport_rx_group = g;
out:
- kfree(flow_group_in);
+ kvfree(flow_group_in);
return err;
}

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index 177e076b8d17..719cecb182c6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -511,7 +511,7 @@ int mlx5_query_nic_vport_system_image_guid(struct mlx5_core_dev *mdev,
*system_image_guid = MLX5_GET64(query_nic_vport_context_out, out,
nic_vport_context.system_image_guid);

- kfree(out);
+ kvfree(out);

return 0;
}
@@ -531,7 +531,7 @@ int mlx5_query_nic_vport_node_guid(struct mlx5_core_dev *mdev, u64 *node_guid)
*node_guid = MLX5_GET64(query_nic_vport_context_out, out,
nic_vport_context.node_guid);

- kfree(out);
+ kvfree(out);

return 0;
}
@@ -587,7 +587,7 @@ int mlx5_query_nic_vport_qkey_viol_cntr(struct mlx5_core_dev *mdev,
*qkey_viol_cntr = MLX5_GET(query_nic_vport_context_out, out,
nic_vport_context.qkey_violation_counter);

- kfree(out);
+ kvfree(out);

return 0;
}
--
2.17.0



2018-05-13 16:23:00

by Eric Dumazet

[permalink] [raw]
Subject: Re: [PATCH v2] {net, IB}/mlx5: Use 'kvfree()' for memory allocated by 'kvzalloc()'



On 05/13/2018 12:00 AM, Christophe JAILLET wrote:
> When 'kvzalloc()' is used to allocate memory, 'kvfree()' must be used to
> free it.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> v1 -> v2: More places to update have been added to the patch


Please add relevant Fixes: tag(s)


2018-05-15 22:22:03

by Jason Gunthorpe

[permalink] [raw]
Subject: Re: [PATCH v2] {net, IB}/mlx5: Use 'kvfree()' for memory allocated by 'kvzalloc()'

On Sun, May 13, 2018 at 09:00:41AM +0200, Christophe JAILLET wrote:
> When 'kvzalloc()' is used to allocate memory, 'kvfree()' must be used to
> free it.
>
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> v1 -> v2: More places to update have been added to the patch
> ---
> drivers/infiniband/hw/mlx5/cq.c | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +-
> drivers/net/ethernet/mellanox/mlx5/core/vport.c | 6 +++---
> 3 files changed, 5 insertions(+), 5 deletions(-)

I agree with Eric on the need for fixes lines in v3..

> diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
> index 77d257ec899b..6d52ea03574e 100644
> --- a/drivers/infiniband/hw/mlx5/cq.c
> +++ b/drivers/infiniband/hw/mlx5/cq.c
> @@ -849,7 +849,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
> return 0;
>
> err_cqb:
> - kfree(*cqb);
> + kvfree(*cqb);

For the infiniband part:

Acked-by: Jason Gunthorpe <[email protected]>

Since this is mostly ethernet, can it go through netdev? thanks

Jason

2018-05-16 00:13:27

by Saeed Mahameed

[permalink] [raw]
Subject: Re: [PATCH v2] {net, IB}/mlx5: Use 'kvfree()' for memory allocated by 'kvzalloc()'

On Tue, May 15, 2018 at 3:21 PM, Jason Gunthorpe <[email protected]> wrote:
> On Sun, May 13, 2018 at 09:00:41AM +0200, Christophe JAILLET wrote:
>> When 'kvzalloc()' is used to allocate memory, 'kvfree()' must be used to
>> free it.
>>
>> Signed-off-by: Christophe JAILLET <[email protected]>
>> ---
>> v1 -> v2: More places to update have been added to the patch
>> ---
>> drivers/infiniband/hw/mlx5/cq.c | 2 +-
>> drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 +-
>> drivers/net/ethernet/mellanox/mlx5/core/vport.c | 6 +++---
>> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> I agree with Eric on the need for fixes lines in v3..
>
>> diff --git a/drivers/infiniband/hw/mlx5/cq.c b/drivers/infiniband/hw/mlx5/cq.c
>> index 77d257ec899b..6d52ea03574e 100644
>> --- a/drivers/infiniband/hw/mlx5/cq.c
>> +++ b/drivers/infiniband/hw/mlx5/cq.c
>> @@ -849,7 +849,7 @@ static int create_cq_user(struct mlx5_ib_dev *dev, struct ib_udata *udata,
>> return 0;
>>
>> err_cqb:
>> - kfree(*cqb);
>> + kvfree(*cqb);
>
> For the infiniband part:
>
> Acked-by: Jason Gunthorpe <[email protected]>
>
> Since this is mostly ethernet, can it go through netdev? thanks
>

for the mlx5 core parts:

Acked-by: Saeed Mahameed <[email protected]>

Yes i will take v3 to mlx5-next branch.

> Jason
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html