Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ba569fc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'devlink-move-reload-fail-indication-to-devlink-core-and-expose-to-user' 



Jiri Pirko says:

====================
net: devlink: move reload fail indication to devlink core and expose to user

First two patches are dependencies of the last one. That moves devlink
reload failure indication to the devlink code, so the drivers do not
have to track it themselves. Currently it is only mlxsw, but I will send
a follow-up patchset that introduces this in netdevsim too.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c6af0c22 2670ac26

drivers/net/ethernet/mellanox/mlx4/catas.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static void mlx4_handle_error_state(struct mlx4_dev_persistent *persist) 
	mutex_lock(&persist->interface_state_mutex);

	if (persist->interface_state & MLX4_INTERFACE_STATE_UP &&

	    !(persist->interface_state & MLX4_INTERFACE_STATE_DELETION)) {

		err = mlx4_restart_one(persist->pdev, false, NULL);

		err = mlx4_restart_one(persist->pdev);

		mlx4_info(persist->dev, "mlx4_restart_one was ended, ret=%d\n",

			  err);

	}

drivers/net/ethernet/mellanox/mlx4/main.c

+36 −8
Original line number Diff line number Diff line
@@ -3931,26 +3931,43 @@ static void mlx4_devlink_param_load_driverinit_values(struct devlink *devlink) 
	}

}



static int mlx4_devlink_reload(struct devlink *devlink,

static void mlx4_restart_one_down(struct pci_dev *pdev);

static int mlx4_restart_one_up(struct pci_dev *pdev, bool reload,

			       struct devlink *devlink);



static int mlx4_devlink_reload_down(struct devlink *devlink,

				    struct netlink_ext_ack *extack)

{

	struct mlx4_priv *priv = devlink_priv(devlink);

	struct mlx4_dev *dev = &priv->dev;

	struct mlx4_dev_persistent *persist = dev->persist;

	int err;



	if (persist->num_vfs)

		mlx4_warn(persist->dev, "Reload performed on PF, will cause reset on operating Virtual Functions\n");

	err = mlx4_restart_one(persist->pdev, true, devlink);

	mlx4_restart_one_down(persist->pdev);

	return 0;

}



static int mlx4_devlink_reload_up(struct devlink *devlink,

				  struct netlink_ext_ack *extack)

{

	struct mlx4_priv *priv = devlink_priv(devlink);

	struct mlx4_dev *dev = &priv->dev;

	struct mlx4_dev_persistent *persist = dev->persist;

	int err;



	err = mlx4_restart_one_up(persist->pdev, true, devlink);

	if (err)

		mlx4_err(persist->dev, "mlx4_restart_one failed, ret=%d\n", err);

		mlx4_err(persist->dev, "mlx4_restart_one_up failed, ret=%d\n",

			 err);



	return err;

}



static const struct devlink_ops mlx4_devlink_ops = {

	.port_type_set	= mlx4_devlink_port_type_set,

	.reload		= mlx4_devlink_reload,

	.reload_down	= mlx4_devlink_reload_down,

	.reload_up	= mlx4_devlink_reload_up,

};



static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
@@ -4163,7 +4180,13 @@ static int restore_current_port_types(struct mlx4_dev *dev, 
	return err;

}



int mlx4_restart_one(struct pci_dev *pdev, bool reload, struct devlink *devlink)

static void mlx4_restart_one_down(struct pci_dev *pdev)

{

	mlx4_unload_one(pdev);

}



static int mlx4_restart_one_up(struct pci_dev *pdev, bool reload,

			       struct devlink *devlink)

{

	struct mlx4_dev_persistent *persist = pci_get_drvdata(pdev);

	struct mlx4_dev	 *dev  = persist->dev;
@@ -4175,7 +4198,6 @@ int mlx4_restart_one(struct pci_dev *pdev, bool reload, struct devlink *devlink) 
	total_vfs = dev->persist->num_vfs;

	memcpy(nvfs, dev->persist->nvfs, sizeof(dev->persist->nvfs));



	mlx4_unload_one(pdev);

	if (reload)

		mlx4_devlink_param_load_driverinit_values(devlink);

	err = mlx4_load_one(pdev, pci_dev_data, total_vfs, nvfs, priv, 1);
@@ -4194,6 +4216,12 @@ int mlx4_restart_one(struct pci_dev *pdev, bool reload, struct devlink *devlink) 
	return err;

}



int mlx4_restart_one(struct pci_dev *pdev)

{

	mlx4_restart_one_down(pdev);

	return mlx4_restart_one_up(pdev, false, NULL);

}



#define MLX_SP(id) { PCI_VDEVICE(MELLANOX, id), MLX4_PCI_DEV_FORCE_SENSE_PORT }

#define MLX_VF(id) { PCI_VDEVICE(MELLANOX, id), MLX4_PCI_DEV_IS_VF }

#define MLX_GN(id) { PCI_VDEVICE(MELLANOX, id), 0 }

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+1 −2
Original line number Diff line number Diff line
@@ -1043,8 +1043,7 @@ int mlx4_catas_init(struct mlx4_dev *dev); 
void mlx4_catas_end(struct mlx4_dev *dev);

int mlx4_crdump_init(struct mlx4_dev *dev);

void mlx4_crdump_end(struct mlx4_dev *dev);

int mlx4_restart_one(struct pci_dev *pdev, bool reload,

		     struct devlink *devlink);

int mlx4_restart_one(struct pci_dev *pdev);

int mlx4_register_device(struct mlx4_dev *dev);

void mlx4_unregister_device(struct mlx4_dev *dev);

void mlx4_dispatch_event(struct mlx4_dev *dev, enum mlx4_dev_event type,

drivers/net/ethernet/mellanox/mlxsw/core.c

+18 −12
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ struct mlxsw_core { 
	struct mlxsw_thermal *thermal;

	struct mlxsw_core_port *ports;

	unsigned int max_ports;

	bool reload_fail;

	bool fw_flash_in_progress;

	unsigned long driver_priv[0];

	/* driver_priv has to be always the last item */
@@ -984,23 +983,29 @@ mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, 
	return 0;

}



static int mlxsw_devlink_core_bus_device_reload(struct devlink *devlink,

static int

mlxsw_devlink_core_bus_device_reload_down(struct devlink *devlink,

					  struct netlink_ext_ack *extack)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	int err;



	if (!(mlxsw_core->bus->features & MLXSW_BUS_F_RESET))

		return -EOPNOTSUPP;



	mlxsw_core_bus_device_unregister(mlxsw_core, true);

	err = mlxsw_core_bus_device_register(mlxsw_core->bus_info,

	return 0;

}



static int

mlxsw_devlink_core_bus_device_reload_up(struct devlink *devlink,

					struct netlink_ext_ack *extack)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);



	return mlxsw_core_bus_device_register(mlxsw_core->bus_info,

					      mlxsw_core->bus,

					      mlxsw_core->bus_priv, true,

					      devlink);

	mlxsw_core->reload_fail = !!err;



	return err;

}



static int mlxsw_devlink_flash_update(struct devlink *devlink,
@@ -1066,7 +1071,8 @@ mlxsw_devlink_trap_group_init(struct devlink *devlink, 
}



static const struct devlink_ops mlxsw_devlink_ops = {

	.reload				= mlxsw_devlink_core_bus_device_reload,

	.reload_down		= mlxsw_devlink_core_bus_device_reload_down,

	.reload_up		= mlxsw_devlink_core_bus_device_reload_up,

	.port_type_set			= mlxsw_devlink_port_type_set,

	.port_split			= mlxsw_devlink_port_split,

	.port_unsplit			= mlxsw_devlink_port_unsplit,
@@ -1243,7 +1249,7 @@ void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, 
{

	struct devlink *devlink = priv_to_devlink(mlxsw_core);



	if (mlxsw_core->reload_fail) {

	if (devlink_is_reload_failed(devlink)) {

		if (!reload)

			/* Only the parts that were not de-initialized in the

			 * failed reload attempt need to be de-initialized.

drivers/net/netdevsim/dev.c

+10 −3
Original line number Diff line number Diff line
@@ -521,7 +521,13 @@ static void nsim_dev_traps_exit(struct devlink *devlink) 
	kfree(nsim_dev->trap_data);

}



static int nsim_dev_reload(struct devlink *devlink,

static int nsim_dev_reload_down(struct devlink *devlink,

				struct netlink_ext_ack *extack)

{

	return 0;

}



static int nsim_dev_reload_up(struct devlink *devlink,

			      struct netlink_ext_ack *extack)

{

	enum nsim_resource_id res_ids[] = {
@@ -638,7 +644,8 @@ nsim_dev_devlink_trap_action_set(struct devlink *devlink, 
}



static const struct devlink_ops nsim_dev_devlink_ops = {

	.reload = nsim_dev_reload,

	.reload_down = nsim_dev_reload_down,

	.reload_up = nsim_dev_reload_up,

	.flash_update = nsim_dev_flash_update,

	.trap_init = nsim_dev_devlink_trap_init,

	.trap_action_set = nsim_dev_devlink_trap_action_set,