net/mlx5: Drain wq first during PCI device removal (41798df9) · Commits · 戴 / test

mlx5_unload_one() is done with cleanup = true only once. So instead of doing health wq drain inside the if(), directly do during PCI device removal. Signed-off-by:

Parav Pandit <parav@mellanox.com> Reviewed-by:

Moshe Shemesh <moshe@mellanox.com> Signed-off-by:

Saeed Mahameed <saeedm@mellanox.com>

drivers/net/ethernet/mellanox/mlx5/core/main.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -1236,10 +1236,8 @@ out:

		void mlx5_unload_one(struct mlx5_core_dev *dev, bool cleanup)
		{
		if (cleanup) {
		if (cleanup)
		mlx5_unregister_device(dev);
		mlx5_drain_health_wq(dev);
		}

		mutex_lock(&dev->intf_state_mutex);
		if (!test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state)) {
		@@ -1382,6 +1380,7 @@ static void remove_one(struct pci_dev *pdev)
		mlx5_crdump_disable(dev);
		mlx5_devlink_unregister(devlink);

		mlx5_drain_health_wq(dev);
		mlx5_unload_one(dev, true);
		mlx5_pci_close(dev);
		mlx5_mdev_uninit(dev);

Admin message