vfio/mlx5: Block incremental query upon migf state error

Yishai Hadas · awilliam · commit d8d577b5fa2a · 2024-02-22T12:17:32.000-07:00
Block incremental query which is state-dependent once the migration file was previously marked with state error. This may prevent redundant calls to firmware upon PRE_COPY which will end-up with a failure and a syndrome printed in dmesg. Signed-off-by: Yishai Hadas <yishaih@nvidia.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Acked-by: Leon Romanovsky <leon@kernel.org> Link: https://lore.kernel.org/r/20240205124828.232701-5-yishaih@nvidia.com Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
diff --git a/drivers/vfio/pci/mlx5/cmd.c b/drivers/vfio/pci/mlx5/cmd.c
@@ -121,6 +121,11 @@ int mlx5vf_cmd_query_vhca_migration_state(struct mlx5vf_pci_core_device *mvdev,
 			}
 			query_flags &= ~MLX5VF_QUERY_INC;
 		}
+		/* Block incremental query which is state-dependent */
+		if (mvdev->saving_migf->state == MLX5_MIGF_STATE_ERROR) {
+			complete(&mvdev->saving_migf->save_comp);
+			return -ENODEV;
+		}
 	}
 
 	MLX5_SET(query_vhca_migration_state_in, in, opcode,

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,11 @@ int mlx5vf_cmd_query_vhca_migration_state(struct mlx5vf_pci_core_device *mvdev,`
`121`	`121`	`}`
`122`	`122`	`query_flags &= ~MLX5VF_QUERY_INC;`
`123`	`123`	`}`
	`124`	`+ /* Block incremental query which is state-dependent */`
	`125`	`+ if (mvdev->saving_migf->state == MLX5_MIGF_STATE_ERROR) {`
	`126`	`+ complete(&mvdev->saving_migf->save_comp);`
	`127`	`+ return -ENODEV;`
	`128`	`+ }`
`124`	`129`	`}`
`125`	`130`
`126`	`131`	`MLX5_SET(query_vhca_migration_state_in, in, opcode,`