net/mlx5: Disable reload while removing the device (60904cd3) · Commits · 戴 / test

While unregistration is in progress, user might be reloading the interface. This can race with unregistration in below flow which uses the resources which are getting disabled by reload flow. Hence, disable the devlink reloading first when removing the device. CPU0 CPU1 ---- ---- local_pci_remove() devlink_mutex remove_one() devlink_nl_cmd_reload() mlx5_unregister_device() devlink_reload() ops->reload_down() mlx5_unload_one() Fixes: ("net/mlx5: Add devlink reload") 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/devlink.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -283,7 +283,6 @@ int mlx5_devlink_register(struct devlink devlink, struct device dev)
		goto params_reg_err;
		mlx5_devlink_set_params_init_values(devlink);
		devlink_params_publish(devlink);
		devlink_reload_enable(devlink);
		return 0;

		params_reg_err:
		@@ -293,7 +292,6 @@ params_reg_err:

		void mlx5_devlink_unregister(struct devlink *devlink)
		{
		devlink_reload_disable(devlink);
		devlink_params_unregister(devlink, mlx5_devlink_params,
		ARRAY_SIZE(mlx5_devlink_params));
		devlink_unregister(devlink);

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -1367,6 +1367,7 @@ static int init_one(struct pci_dev pdev, const struct pci_device_id id)
		dev_err(&pdev->dev, "mlx5_crdump_enable failed with error code %d\n", err);

		pci_save_state(pdev);
		devlink_reload_enable(devlink);
		return 0;

		err_load_one:
		@@ -1384,6 +1385,7 @@ static void remove_one(struct pci_dev *pdev)
		struct mlx5_core_dev *dev = pci_get_drvdata(pdev);
		struct devlink *devlink = priv_to_devlink(dev);

		devlink_reload_disable(devlink);
		mlx5_crdump_disable(dev);
		mlx5_devlink_unregister(devlink);

Admin message