Skip to contentSkip to conversation

vdpa/mlx5: simplfy error handler in mlx5_vdpa_dev_add()

PATCH In review [email protected] 2 participants 3 messages Jan 9, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vdpa/mlx5: simplfy error handler in mlx5_vdpa_dev_add()

From: Tom Rix <[email protected]>

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.

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -2
index 37220f6db7ad7..2d38b8fe9305e 100644
@@ -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);
Signature · 1 line
2.26.3
#1 lore raw
Quoted 8 lines · On Sun, Jan 09, 2022 at 05:24:22AM -0800, [email protected] wrote:

From: Tom Rix <[email protected]>

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.

---

It's not fixing anything, right? Maybe add justification for this change by e.g. showing the code size had decreased or so?

Quoted 28 lines
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -2
index 37220f6db7ad7..2d38b8fe9305e 100644
@@ -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);
Signature · 1 line
2.26.3
author
#2 lore raw
Quoted 10 lines · Eli Cohen
Quoted 8 lines · On Sun, Jan 09, 2022 at 05:24:22AM -0800, [email protected] wrote:

From: Tom Rix <[email protected]>

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.

---

It's not fixing anything, right?

Correct, or I would have added a Fixes: tag

Quoted 2 lines

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

Quoted 28 lines
Quoted 28 lines
  drivers/vdpa/mlx5/net/mlx5_vnet.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -2
index 37220f6db7ad7..2d38b8fe9305e 100644
@@ -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);
Signature · 1 line
2.26.3