* [PATCH] vdpa/mlx5: simplfy error handler in mlx5_vdpa_dev_add()
@ 2022-01-09 13:24 trix
2022-01-09 14:12 ` Eli Cohen
0 siblings, 1 reply; 3+ messages in thread
From: trix @ 2022-01-09 13:24 UTC (permalink / raw)
To: mst, jasowang, elic, parav, si-wei.liu, xieyongji
Cc: virtualization, linux-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
The use of pfmdev is protected by two calls to is_zero_ether_add().
The second call in the error handler can be replaced by
checking if pfmdev was set as part of the earlier call.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index 37220f6db7ad7..2d38b8fe9305e 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -2530,7 +2530,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
{
struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
struct virtio_net_config *config;
- struct mlx5_core_dev *pfmdev;
+ struct mlx5_core_dev *pfmdev = NULL;
struct mlx5_vdpa_dev *mvdev;
struct mlx5_vdpa_net *ndev;
struct mlx5_core_dev *mdev;
@@ -2654,7 +2654,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
err_res:
mlx5_vdpa_free_resources(&ndev->mvdev);
err_mpfs:
- if (!is_zero_ether_addr(config->mac))
+ if (pfmdev)
mlx5_mpfs_del_mac(pfmdev, config->mac);
err_mtu:
mutex_destroy(&ndev->reslock);
--
2.26.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] vdpa/mlx5: simplfy error handler in mlx5_vdpa_dev_add()
2022-01-09 13:24 [PATCH] vdpa/mlx5: simplfy error handler in mlx5_vdpa_dev_add() trix
@ 2022-01-09 14:12 ` Eli Cohen
2022-01-09 17:02 ` Tom Rix
0 siblings, 1 reply; 3+ messages in thread
From: Eli Cohen @ 2022-01-09 14:12 UTC (permalink / raw)
To: trix
Cc: mst, jasowang, parav, si-wei.liu, xieyongji, virtualization,
linux-kernel
On Sun, Jan 09, 2022 at 05:24:22AM -0800, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
>
> The use of pfmdev is protected by two calls to is_zero_ether_add().
> The second call in the error handler can be replaced by
> checking if pfmdev was set as part of the earlier call.
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
It's not fixing anything, right? Maybe add justification for this change
by e.g. showing the code size had decreased or so?
> drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index 37220f6db7ad7..2d38b8fe9305e 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -2530,7 +2530,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
> {
> struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
> struct virtio_net_config *config;
> - struct mlx5_core_dev *pfmdev;
> + struct mlx5_core_dev *pfmdev = NULL;
> struct mlx5_vdpa_dev *mvdev;
> struct mlx5_vdpa_net *ndev;
> struct mlx5_core_dev *mdev;
> @@ -2654,7 +2654,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
> err_res:
> mlx5_vdpa_free_resources(&ndev->mvdev);
> err_mpfs:
> - if (!is_zero_ether_addr(config->mac))
> + if (pfmdev)
> mlx5_mpfs_del_mac(pfmdev, config->mac);
> err_mtu:
> mutex_destroy(&ndev->reslock);
> --
> 2.26.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] vdpa/mlx5: simplfy error handler in mlx5_vdpa_dev_add()
2022-01-09 14:12 ` Eli Cohen
@ 2022-01-09 17:02 ` Tom Rix
0 siblings, 0 replies; 3+ messages in thread
From: Tom Rix @ 2022-01-09 17:02 UTC (permalink / raw)
To: Eli Cohen
Cc: mst, jasowang, parav, si-wei.liu, xieyongji, virtualization,
linux-kernel
On 1/9/22 6:12 AM, Eli Cohen wrote:
> On Sun, Jan 09, 2022 at 05:24:22AM -0800, trix@redhat.com wrote:
>> From: Tom Rix <trix@redhat.com>
>>
>> The use of pfmdev is protected by two calls to is_zero_ether_add().
>> The second call in the error handler can be replaced by
>> checking if pfmdev was set as part of the earlier call.
>>
>> Signed-off-by: Tom Rix <trix@redhat.com>
>> ---
> It's not fixing anything, right?
Correct, or I would have added a Fixes: tag
> Maybe add justification for this change
> by e.g. showing the code size had decreased or so?
Sorry, I thought I had done that. Generally removing any function call
is a win and the worst case is a tie.
Tom
>> drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
>> index 37220f6db7ad7..2d38b8fe9305e 100644
>> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
>> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
>> @@ -2530,7 +2530,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
>> {
>> struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
>> struct virtio_net_config *config;
>> - struct mlx5_core_dev *pfmdev;
>> + struct mlx5_core_dev *pfmdev = NULL;
>> struct mlx5_vdpa_dev *mvdev;
>> struct mlx5_vdpa_net *ndev;
>> struct mlx5_core_dev *mdev;
>> @@ -2654,7 +2654,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
>> err_res:
>> mlx5_vdpa_free_resources(&ndev->mvdev);
>> err_mpfs:
>> - if (!is_zero_ether_addr(config->mac))
>> + if (pfmdev)
>> mlx5_mpfs_del_mac(pfmdev, config->mac);
>> err_mtu:
>> mutex_destroy(&ndev->reslock);
>> --
>> 2.26.3
>>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-09 17:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-09 13:24 [PATCH] vdpa/mlx5: simplfy error handler in mlx5_vdpa_dev_add() trix
2022-01-09 14:12 ` Eli Cohen
2022-01-09 17:02 ` Tom Rix
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox