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

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

Merge branch 'devlink-extack' 



David Ahern says:

====================
devlink: Add extack messages for reload and port split/unsplit

Patch 1 adds extack arg to reload, port_split and port_unsplit devlink
operations.

Patch 2 adds extack messages for reload operation in netdevsim.

Patch 3 adds extack messages to port split/unsplit in mlxsw driver.

v2
- make the extack messages align with existing dev_err
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5b5e7a0d 3fcc773b

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

+16 −7
Original line number Diff line number Diff line
@@ -770,27 +770,35 @@ static void mlxsw_core_driver_put(const char *kind) 


static int mlxsw_devlink_port_split(struct devlink *devlink,

				    unsigned int port_index,

				    unsigned int count)

				    unsigned int count,

				    struct netlink_ext_ack *extack)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);



	if (port_index >= mlxsw_core->max_ports)

	if (port_index >= mlxsw_core->max_ports) {

		NL_SET_ERR_MSG_MOD(extack, "Port index exceeds maximum number of ports");

		return -EINVAL;

	}

	if (!mlxsw_core->driver->port_split)

		return -EOPNOTSUPP;

	return mlxsw_core->driver->port_split(mlxsw_core, port_index, count);

	return mlxsw_core->driver->port_split(mlxsw_core, port_index, count,

					      extack);

}



static int mlxsw_devlink_port_unsplit(struct devlink *devlink,

				      unsigned int port_index)

				      unsigned int port_index,

				      struct netlink_ext_ack *extack)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);



	if (port_index >= mlxsw_core->max_ports)

	if (port_index >= mlxsw_core->max_ports) {

		NL_SET_ERR_MSG_MOD(extack, "Port index exceeds maximum number of ports");

		return -EINVAL;

	}

	if (!mlxsw_core->driver->port_unsplit)

		return -EOPNOTSUPP;

	return mlxsw_core->driver->port_unsplit(mlxsw_core, port_index);

	return mlxsw_core->driver->port_unsplit(mlxsw_core, port_index,

						extack);

}



static int
@@ -963,7 +971,8 @@ mlxsw_devlink_sb_occ_tc_port_bind_get(struct devlink_port *devlink_port, 
						     pool_type, p_cur, p_max);

}



static int mlxsw_devlink_core_bus_device_reload(struct devlink *devlink)

static int mlxsw_devlink_core_bus_device_reload(struct devlink *devlink,

						struct netlink_ext_ack *extack)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	int err;

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

+3 −2
Original line number Diff line number Diff line
@@ -274,8 +274,9 @@ struct mlxsw_driver { 
	int (*port_type_set)(struct mlxsw_core *mlxsw_core, u8 local_port,

			     enum devlink_port_type new_type);

	int (*port_split)(struct mlxsw_core *mlxsw_core, u8 local_port,

			  unsigned int count);

	int (*port_unsplit)(struct mlxsw_core *mlxsw_core, u8 local_port);

			  unsigned int count, struct netlink_ext_ack *extack);

	int (*port_unsplit)(struct mlxsw_core *mlxsw_core, u8 local_port,

			    struct netlink_ext_ack *extack);

	int (*sb_pool_get)(struct mlxsw_core *mlxsw_core,

			   unsigned int sb_index, u16 pool_index,

			   struct devlink_sb_pool_info *pool_info);

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

+12 −3
Original line number Diff line number Diff line
@@ -3092,7 +3092,8 @@ static void mlxsw_sp_port_unsplit_create(struct mlxsw_sp *mlxsw_sp, 
}



static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port,

			       unsigned int count)

			       unsigned int count,

			       struct netlink_ext_ack *extack)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct mlxsw_sp_port *mlxsw_sp_port;
@@ -3104,6 +3105,7 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port, 
	if (!mlxsw_sp_port) {

		dev_err(mlxsw_sp->bus_info->dev, "Port number \"%d\" does not exist\n",

			local_port);

		NL_SET_ERR_MSG_MOD(extack, "Port number does not exist");

		return -EINVAL;

	}
@@ -3112,11 +3114,13 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port, 


	if (count != 2 && count != 4) {

		netdev_err(mlxsw_sp_port->dev, "Port can only be split into 2 or 4 ports\n");

		NL_SET_ERR_MSG_MOD(extack, "Port can only be split into 2 or 4 ports");

		return -EINVAL;

	}



	if (cur_width != MLXSW_PORT_MODULE_MAX_WIDTH) {

		netdev_err(mlxsw_sp_port->dev, "Port cannot be split further\n");

		NL_SET_ERR_MSG_MOD(extack, "Port cannot be split further");

		return -EINVAL;

	}
@@ -3125,6 +3129,7 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port, 
		base_port = local_port;

		if (mlxsw_sp->ports[base_port + 1]) {

			netdev_err(mlxsw_sp_port->dev, "Invalid split configuration\n");

			NL_SET_ERR_MSG_MOD(extack, "Invalid split configuration");

			return -EINVAL;

		}

	} else {
@@ -3132,6 +3137,7 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port, 
		if (mlxsw_sp->ports[base_port + 1] ||

		    mlxsw_sp->ports[base_port + 3]) {

			netdev_err(mlxsw_sp_port->dev, "Invalid split configuration\n");

			NL_SET_ERR_MSG_MOD(extack, "Invalid split configuration");

			return -EINVAL;

		}

	}
@@ -3153,7 +3159,8 @@ static int mlxsw_sp_port_split(struct mlxsw_core *mlxsw_core, u8 local_port, 
	return err;

}



static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port)

static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port,

				 struct netlink_ext_ack *extack)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_core_driver_priv(mlxsw_core);

	struct mlxsw_sp_port *mlxsw_sp_port;
@@ -3165,11 +3172,13 @@ static int mlxsw_sp_port_unsplit(struct mlxsw_core *mlxsw_core, u8 local_port) 
	if (!mlxsw_sp_port) {

		dev_err(mlxsw_sp->bus_info->dev, "Port number \"%d\" does not exist\n",

			local_port);

		NL_SET_ERR_MSG_MOD(extack, "Port number does not exist");

		return -EINVAL;

	}



	if (!mlxsw_sp_port->split) {

		netdev_err(mlxsw_sp_port->dev, "Port wasn't split\n");

		netdev_err(mlxsw_sp_port->dev, "Port was not split\n");

		NL_SET_ERR_MSG_MOD(extack, "Port was not split");

		return -EINVAL;

	}

drivers/net/ethernet/netronome/nfp/nfp_devlink.c

+3 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ nfp_devlink_set_lanes(struct nfp_pf *pf, unsigned int idx, unsigned int lanes) 


static int

nfp_devlink_port_split(struct devlink *devlink, unsigned int port_index,

		       unsigned int count)

		       unsigned int count, struct netlink_ext_ack *extack)

{

	struct nfp_pf *pf = devlink_priv(devlink);

	struct nfp_eth_table_port eth_port;
@@ -123,7 +123,8 @@ nfp_devlink_port_split(struct devlink *devlink, unsigned int port_index, 
}



static int

nfp_devlink_port_unsplit(struct devlink *devlink, unsigned int port_index)

nfp_devlink_port_unsplit(struct devlink *devlink, unsigned int port_index,

			 struct netlink_ext_ack *extack)

{

	struct nfp_pf *pf = devlink_priv(devlink);

	struct nfp_eth_table_port eth_port;

drivers/net/netdevsim/devlink.c

+4 −3
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ static int devlink_resources_register(struct devlink *devlink) 
	return err;

}



static int nsim_devlink_reload(struct devlink *devlink)

static int nsim_devlink_reload(struct devlink *devlink,

			       struct netlink_ext_ack *extack)

{

	enum nsim_resource_id res_ids[] = {

		NSIM_RESOURCE_IPV4_FIB, NSIM_RESOURCE_IPV4_FIB_RULES,
@@ -162,7 +163,7 @@ static int nsim_devlink_reload(struct devlink *devlink) 


		err = devlink_resource_size_get(devlink, res_ids[i], &val);

		if (!err) {

			err = nsim_fib_set_max(net, res_ids[i], val);

			err = nsim_fib_set_max(net, res_ids[i], val, extack);

			if (err)

				return err;

		}
@@ -180,7 +181,7 @@ static void nsim_devlink_net_reset(struct net *net) 
	int i;



	for (i = 0; i < ARRAY_SIZE(res_ids); ++i) {

		if (nsim_fib_set_max(net, res_ids[i], (u64)-1)) {

		if (nsim_fib_set_max(net, res_ids[i], (u64)-1, NULL)) {

			pr_err("Failed to reset limit for resource %u\n",

			       res_ids[i]);

		}