Commit 2b1c1906 authored by Yishai Hadas's avatar Yishai Hadas Committed by Alex Williamson
Browse files

vfio/mlx5: Protect mlx5vf_disable_fds() upon close device 



Protect mlx5vf_disable_fds() upon close device to be called under the
state mutex as done in all other places.

This will prevent a race with any other flow which calls
mlx5vf_disable_fds() as of health/recovery upon
MLX5_PF_NOTIFY_DISABLE_VF event.

Encapsulate this functionality in a separate function named
mlx5vf_cmd_close_migratable() to consider migration caps and for further
usage upon close device.

Fixes: 6fadb021 ("vfio/mlx5: Implement vfio_pci driver for mlx5 devices")
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarYishai Hadas <yishaih@nvidia.com>
Link: https://lore.kernel.org/r/20220628155910.171454-2-yishaih@nvidia.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent d1877e63

drivers/vfio/pci/mlx5/cmd.c

+10 −0
Original line number Diff line number Diff line
@@ -88,6 +88,16 @@ static int mlx5fv_vf_event(struct notifier_block *nb, 
	return 0;

}



void mlx5vf_cmd_close_migratable(struct mlx5vf_pci_core_device *mvdev)

{

	if (!mvdev->migrate_cap)

		return;



	mutex_lock(&mvdev->state_mutex);

	mlx5vf_disable_fds(mvdev);

	mlx5vf_state_mutex_unlock(mvdev);

}



void mlx5vf_cmd_remove_migratable(struct mlx5vf_pci_core_device *mvdev)

{

	if (!mvdev->migrate_cap)

drivers/vfio/pci/mlx5/cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ int mlx5vf_cmd_query_vhca_migration_state(struct mlx5vf_pci_core_device *mvdev, 
					  size_t *state_size);

void mlx5vf_cmd_set_migratable(struct mlx5vf_pci_core_device *mvdev);

void mlx5vf_cmd_remove_migratable(struct mlx5vf_pci_core_device *mvdev);

void mlx5vf_cmd_close_migratable(struct mlx5vf_pci_core_device *mvdev);

int mlx5vf_cmd_save_vhca_state(struct mlx5vf_pci_core_device *mvdev,

			       struct mlx5_vf_migration_file *migf);

int mlx5vf_cmd_load_vhca_state(struct mlx5vf_pci_core_device *mvdev,

drivers/vfio/pci/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ static void mlx5vf_pci_close_device(struct vfio_device *core_vdev) 
	struct mlx5vf_pci_core_device *mvdev = container_of(

		core_vdev, struct mlx5vf_pci_core_device, core_device.vdev);



	mlx5vf_disable_fds(mvdev);

	mlx5vf_cmd_close_migratable(mvdev);

	vfio_pci_core_close_device(core_vdev);

}