Commit 216aa67f authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

devlink: move port_fn_state_get/set() to devlink_port_ops 



Move port_fn_state_get/set() from devlink_ops into newly introduced
devlink_port_ops.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4a490d71

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

+0 −2
Original line number Diff line number Diff line
@@ -321,8 +321,6 @@ static const struct devlink_ops mlx5_devlink_ops = { 
#ifdef CONFIG_MLX5_SF_MANAGER

	.port_new = mlx5_devlink_sf_port_new,

	.port_del = mlx5_devlink_sf_port_del,

	.port_fn_state_get = mlx5_devlink_sf_port_fn_state_get,

	.port_fn_state_set = mlx5_devlink_sf_port_fn_state_set,

#endif

	.flash_update = mlx5_devlink_flash_update,

	.info_get = mlx5_devlink_info_get,

drivers/net/ethernet/mellanox/mlx5/core/esw/devlink_port.c

+4 −0
Original line number Diff line number Diff line
@@ -149,6 +149,10 @@ static const struct devlink_port_ops mlx5_esw_dl_sf_port_ops = { 
	.port_fn_hw_addr_set = mlx5_devlink_port_fn_hw_addr_set,

	.port_fn_roce_get = mlx5_devlink_port_fn_roce_get,

	.port_fn_roce_set = mlx5_devlink_port_fn_roce_set,

#ifdef CONFIG_MLX5_SF_MANAGER

	.port_fn_state_get = mlx5_devlink_sf_port_fn_state_get,

	.port_fn_state_set = mlx5_devlink_sf_port_fn_state_set,

#endif

};



int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_port *dl_port,

include/net/devlink.h

+15 −30
Original line number Diff line number Diff line
@@ -1464,36 +1464,6 @@ struct devlink_ops { 
	 */

	int (*port_del)(struct devlink *devlink, struct devlink_port *port,

			struct netlink_ext_ack *extack);

	/**

	 * port_fn_state_get() - Get the state of a port function

	 * @devlink: Devlink instance

	 * @port: The devlink port

	 * @state: Admin configured state

	 * @opstate: Current operational state

	 * @extack: extack for reporting error messages

	 *

	 * Reports the admin and operational state of a devlink port function

	 *

	 * Return: 0 on success, negative value otherwise.

	 */

	int (*port_fn_state_get)(struct devlink_port *port,

				 enum devlink_port_fn_state *state,

				 enum devlink_port_fn_opstate *opstate,

				 struct netlink_ext_ack *extack);

	/**

	 * port_fn_state_set() - Set the admin state of a port function

	 * @devlink: Devlink instance

	 * @port: The devlink port

	 * @state: Admin state

	 * @extack: extack for reporting error messages

	 *

	 * Set the admin state of a devlink port function

	 *

	 * Return: 0 on success, negative value otherwise.

	 */

	int (*port_fn_state_set)(struct devlink_port *port,

				 enum devlink_port_fn_state state,

				 struct netlink_ext_ack *extack);



	/**

	 * Rate control callbacks.
@@ -1613,6 +1583,14 @@ void devlink_free(struct devlink *devlink); 
 *			    capability. Should be used by device drivers

 *			    to enable/disable migratable capability of

 *			    a function managed by the devlink port.

 * @port_fn_state_get: Callback used to get port function's state.

 *		       Should be used by device drivers to report

 *		       the current admin and operational state of a

 *		       function managed by the devlink port.

 * @port_fn_state_set: Callback used to get port function's state.

 *		       Should be used by device drivers set

 *		       the admin state of a function managed

 *		       by the devlink port.

 *

 * Note: Driver should return -EOPNOTSUPP if it doesn't support

 * port function (@port_fn_*) handling for a particular port.
@@ -1641,6 +1619,13 @@ struct devlink_port_ops { 
	int (*port_fn_migratable_set)(struct devlink_port *devlink_port,

				      bool enable,

				      struct netlink_ext_ack *extack);

	int (*port_fn_state_get)(struct devlink_port *port,

				 enum devlink_port_fn_state *state,

				 enum devlink_port_fn_opstate *opstate,

				 struct netlink_ext_ack *extack);

	int (*port_fn_state_set)(struct devlink_port *port,

				 enum devlink_port_fn_state state,

				 struct netlink_ext_ack *extack);

};



void devlink_port_init(struct devlink *devlink,

net/devlink/leftover.c

+7 −12
Original line number Diff line number Diff line
@@ -787,8 +787,7 @@ devlink_port_fn_opstate_valid(enum devlink_port_fn_opstate opstate) 
	       opstate == DEVLINK_PORT_FN_OPSTATE_ATTACHED;

}



static int devlink_port_fn_state_fill(const struct devlink_ops *ops,

				      struct devlink_port *port,

static int devlink_port_fn_state_fill(struct devlink_port *port,

				      struct sk_buff *msg,

				      struct netlink_ext_ack *extack,

				      bool *msg_updated)
@@ -797,10 +796,10 @@ static int devlink_port_fn_state_fill(const struct devlink_ops *ops, 
	enum devlink_port_fn_state state;

	int err;



	if (!ops->port_fn_state_get)

	if (!port->ops->port_fn_state_get)

		return 0;



	err = ops->port_fn_state_get(port, &state, &opstate, extack);

	err = port->ops->port_fn_state_get(port, &state, &opstate, extack);

	if (err) {

		if (err == -EOPNOTSUPP)

			return 0;
@@ -870,7 +869,6 @@ static int 
devlink_nl_port_function_attrs_put(struct sk_buff *msg, struct devlink_port *port,

				   struct netlink_ext_ack *extack)

{

	const struct devlink_ops *ops;

	struct nlattr *function_attr;

	bool msg_updated = false;

	int err;
@@ -879,14 +877,13 @@ devlink_nl_port_function_attrs_put(struct sk_buff *msg, struct devlink_port *por 
	if (!function_attr)

		return -EMSGSIZE;



	ops = port->devlink->ops;

	err = devlink_port_fn_hw_addr_fill(port, msg, extack, &msg_updated);

	if (err)

		goto out;

	err = devlink_port_fn_caps_fill(port, msg, extack, &msg_updated);

	if (err)

		goto out;

	err = devlink_port_fn_state_fill(ops, port, msg, extack, &msg_updated);

	err = devlink_port_fn_state_fill(port, msg, extack, &msg_updated);

out:

	if (err || !msg_updated)

		nla_nest_cancel(msg, function_attr);
@@ -1179,18 +1176,15 @@ static int devlink_port_fn_state_set(struct devlink_port *port, 
				     struct netlink_ext_ack *extack)

{

	enum devlink_port_fn_state state;

	const struct devlink_ops *ops;



	state = nla_get_u8(attr);

	ops = port->devlink->ops;

	return ops->port_fn_state_set(port, state, extack);

	return port->ops->port_fn_state_set(port, state, extack);

}



static int devlink_port_function_validate(struct devlink_port *devlink_port,

					  struct nlattr **tb,

					  struct netlink_ext_ack *extack)

{

	const struct devlink_ops *ops = devlink_port->devlink->ops;

	struct nlattr *attr;



	if (tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR] &&
@@ -1199,7 +1193,8 @@ static int devlink_port_function_validate(struct devlink_port *devlink_port, 
				    "Port doesn't support function attributes");

		return -EOPNOTSUPP;

	}

	if (tb[DEVLINK_PORT_FN_ATTR_STATE] && !ops->port_fn_state_set) {

	if (tb[DEVLINK_PORT_FN_ATTR_STATE] &&

	    !devlink_port->ops->port_fn_state_set) {

		NL_SET_ERR_MSG_ATTR(extack, tb[DEVLINK_PORT_FUNCTION_ATTR_HW_ADDR],

				    "Function does not support state setting");

		return -EOPNOTSUPP;