RDMA/mlx5: Call dev_put() after the blocking notifier

chiarameiohas · rleon · commit 6d9c7b272966 · 2024-11-04T06:57:20.000-05:00
Move dev_put() call to occur directly after the blocking notifier, instead of within the event handler. Fixes: 8d159eb ("RDMA/mlx5: Use IB set_netdev and get_netdev functions") Signed-off-by: Chiara Meiohas <cmeiohas@nvidia.com> Link: https://patch.msgid.link/342ff94b3dcbb07da1c7dab862a73933d604b717.1730381292.git.leon@kernel.org Signed-off-by: Leon Romanovsky <leon@kernel.org>
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
@@ -3242,7 +3242,6 @@ static int lag_event(struct notifier_block *nb, unsigned long event, void *data)
 			}
 			err = ib_device_set_netdev(&dev->ib_dev, ndev,
 						   portnum + 1);
-			dev_put(ndev);
 			if (err)
 				return err;
 			/* Rescan gids after new netdev assignment */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c b/drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c
@@ -516,6 +516,7 @@ void mlx5_modify_lag(struct mlx5_lag *ldev,
 		blocking_notifier_call_chain(&dev0->priv.lag_nh,
 					     MLX5_DRIVER_EVENT_ACTIVE_BACKUP_LAG_CHANGE_LOWERSTATE,
 					     ndev);
+		dev_put(ndev);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3242,7 +3242,6 @@ static int lag_event(struct notifier_block nb, unsigned long event, void data)`
`3242`	`3242`	`}`
`3243`	`3243`	`err = ib_device_set_netdev(&dev->ib_dev, ndev,`
`3244`	`3244`	`portnum + 1);`
`3245`		`- dev_put(ndev);`
`3246`	`3245`	`if (err)`
`3247`	`3246`	`return err;`
`3248`	`3247`	`/* Rescan gids after new netdev assignment */`
Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,7 @@ void mlx5_modify_lag(struct mlx5_lag *ldev,`
`516`	`516`	`blocking_notifier_call_chain(&dev0->priv.lag_nh,`
`517`	`517`	`MLX5_DRIVER_EVENT_ACTIVE_BACKUP_LAG_CHANGE_LOWERSTATE,`
`518`	`518`	`ndev);`
	`519`	`+ dev_put(ndev);`
`519`	`520`	`}`
`520`	`521`	`}`
`521`	`522`