Commit 2e246bca authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'devlink-move-port-ops-into-separate-structure' 

Jiri Pirko says:

====================
devlink: move port ops into separate structure

In devlink, some of the objects have separate ops registered alongside
with the object itself. Port however have ops in devlink_ops structure.
For drivers what register multiple kinds of ports with different ops
this is not convenient.

This patchset changes does following changes:
1) Introduces devlink_port_ops with functions that allow devlink port
   to be registered passing a pointer to driver port ops. (patch #1)
2) Converts drivers to define port_ops and register ports passing the
   ops pointer. (patches #2, #3, #4, #6, #8, and #9)
3) Moves ops from devlink_ops struct to devlink_port_ops.
   (patches #5, #7, #10-15)

No functional changes.
====================

Link: https://lore.kernel.org/r/20230526102841.2226553-1-jiri@resnulli.us


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents bc638eab 4b5ed2b5

drivers/net/ethernet/intel/ice/ice_devlink.c

+7 −3
Original line number Diff line number Diff line
@@ -1256,8 +1256,6 @@ static const struct devlink_ops ice_devlink_ops = { 
			  BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE),

	.reload_down = ice_devlink_reload_down,

	.reload_up = ice_devlink_reload_up,

	.port_split = ice_devlink_port_split,

	.port_unsplit = ice_devlink_port_unsplit,

	.eswitch_mode_get = ice_eswitch_mode_get,

	.eswitch_mode_set = ice_eswitch_mode_set,

	.info_get = ice_devlink_info_get,
@@ -1512,6 +1510,11 @@ ice_devlink_set_port_split_options(struct ice_pf *pf, 
	ice_active_port_option = active_idx;

}



static const struct devlink_port_ops ice_devlink_port_ops = {

	.port_split = ice_devlink_port_split,

	.port_unsplit = ice_devlink_port_unsplit,

};



/**

 * ice_devlink_create_pf_port - Create a devlink port for this PF

 * @pf: the PF to create a devlink port for
@@ -1551,7 +1554,8 @@ int ice_devlink_create_pf_port(struct ice_pf *pf) 
	devlink_port_attrs_set(devlink_port, &attrs);

	devlink = priv_to_devlink(pf);



	err = devlink_port_register(devlink, devlink_port, vsi->idx);

	err = devlink_port_register_with_ops(devlink, devlink_port, vsi->idx,

					     &ice_devlink_port_ops);

	if (err) {

		dev_err(dev, "Failed to create devlink port for PF %d, error %d\n",

			pf->hw.pf_id, err);

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

+31 −27
Original line number Diff line number Diff line
@@ -3024,13 +3024,43 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev) 
	}

}



static int mlx4_devlink_port_type_set(struct devlink_port *devlink_port,

				      enum devlink_port_type port_type)

{

	struct mlx4_port_info *info = container_of(devlink_port,

						   struct mlx4_port_info,

						   devlink_port);

	enum mlx4_port_type mlx4_port_type;



	switch (port_type) {

	case DEVLINK_PORT_TYPE_AUTO:

		mlx4_port_type = MLX4_PORT_TYPE_AUTO;

		break;

	case DEVLINK_PORT_TYPE_ETH:

		mlx4_port_type = MLX4_PORT_TYPE_ETH;

		break;

	case DEVLINK_PORT_TYPE_IB:

		mlx4_port_type = MLX4_PORT_TYPE_IB;

		break;

	default:

		return -EOPNOTSUPP;

	}



	return __set_port_type(info, mlx4_port_type);

}



static const struct devlink_port_ops mlx4_devlink_port_ops = {

	.port_type_set = mlx4_devlink_port_type_set,

};



static int mlx4_init_port_info(struct mlx4_dev *dev, int port)

{

	struct devlink *devlink = priv_to_devlink(mlx4_priv(dev));

	struct mlx4_port_info *info = &mlx4_priv(dev)->port[port];

	int err;



	err = devl_port_register(devlink, &info->devlink_port, port);

	err = devl_port_register_with_ops(devlink, &info->devlink_port, port,

					  &mlx4_devlink_port_ops);

	if (err)

		return err;
@@ -3874,31 +3904,6 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data, 
	return err;

}



static int mlx4_devlink_port_type_set(struct devlink_port *devlink_port,

				      enum devlink_port_type port_type)

{

	struct mlx4_port_info *info = container_of(devlink_port,

						   struct mlx4_port_info,

						   devlink_port);

	enum mlx4_port_type mlx4_port_type;



	switch (port_type) {

	case DEVLINK_PORT_TYPE_AUTO:

		mlx4_port_type = MLX4_PORT_TYPE_AUTO;

		break;

	case DEVLINK_PORT_TYPE_ETH:

		mlx4_port_type = MLX4_PORT_TYPE_ETH;

		break;

	case DEVLINK_PORT_TYPE_IB:

		mlx4_port_type = MLX4_PORT_TYPE_IB;

		break;

	default:

		return -EOPNOTSUPP;

	}



	return __set_port_type(info, mlx4_port_type);

}



static void mlx4_devlink_param_load_driverinit_values(struct devlink *devlink)

{

	struct mlx4_priv *priv = devlink_priv(devlink);
@@ -3983,7 +3988,6 @@ static int mlx4_devlink_reload_up(struct devlink *devlink, enum devlink_reload_a 
}



static const struct devlink_ops mlx4_devlink_ops = {

	.port_type_set	= mlx4_devlink_port_type_set,

	.reload_actions = BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT),

	.reload_down	= mlx4_devlink_reload_down,

	.reload_up	= mlx4_devlink_reload_up,

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

+0 −9
Original line number Diff line number Diff line
@@ -310,8 +310,6 @@ static const struct devlink_ops mlx5_devlink_ops = { 
	.eswitch_inline_mode_get = mlx5_devlink_eswitch_inline_mode_get,

	.eswitch_encap_mode_set = mlx5_devlink_eswitch_encap_mode_set,

	.eswitch_encap_mode_get = mlx5_devlink_eswitch_encap_mode_get,

	.port_function_hw_addr_get = mlx5_devlink_port_function_hw_addr_get,

	.port_function_hw_addr_set = mlx5_devlink_port_function_hw_addr_set,

	.rate_leaf_tx_share_set = mlx5_esw_devlink_rate_leaf_tx_share_set,

	.rate_leaf_tx_max_set = mlx5_esw_devlink_rate_leaf_tx_max_set,

	.rate_node_tx_share_set = mlx5_esw_devlink_rate_node_tx_share_set,
@@ -319,16 +317,9 @@ static const struct devlink_ops mlx5_devlink_ops = { 
	.rate_node_new = mlx5_esw_devlink_rate_node_new,

	.rate_node_del = mlx5_esw_devlink_rate_node_del,

	.rate_leaf_parent_set = mlx5_esw_devlink_rate_parent_set,

	.port_fn_roce_get = mlx5_devlink_port_fn_roce_get,

	.port_fn_roce_set = mlx5_devlink_port_fn_roce_set,

	.port_fn_migratable_get = mlx5_devlink_port_fn_migratable_get,

	.port_fn_migratable_set = mlx5_devlink_port_fn_migratable_set,

#endif

#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

+27 −2
Original line number Diff line number Diff line
@@ -65,6 +65,15 @@ static void mlx5_esw_dl_port_free(struct devlink_port *dl_port) 
	kfree(dl_port);

}



static const struct devlink_port_ops mlx5_esw_dl_port_ops = {

	.port_fn_hw_addr_get = mlx5_devlink_port_fn_hw_addr_get,

	.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,

	.port_fn_migratable_get = mlx5_devlink_port_fn_migratable_get,

	.port_fn_migratable_set = mlx5_devlink_port_fn_migratable_set,

};



int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_num)

{

	struct mlx5_core_dev *dev = esw->dev;
@@ -87,7 +96,8 @@ int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_ 


	devlink = priv_to_devlink(dev);

	dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, vport_num);

	err = devl_port_register(devlink, dl_port, dl_port_index);

	err = devl_port_register_with_ops(devlink, dl_port, dl_port_index,

					  &mlx5_esw_dl_port_ops);

	if (err)

		goto reg_err;
@@ -134,6 +144,20 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1 
	return IS_ERR(vport) ? ERR_CAST(vport) : vport->dl_port;

}



static const struct devlink_port_ops mlx5_esw_dl_sf_port_ops = {

#ifdef CONFIG_MLX5_SF_MANAGER

	.port_del = mlx5_devlink_sf_port_del,

#endif

	.port_fn_hw_addr_get = mlx5_devlink_port_fn_hw_addr_get,

	.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,

				      u16 vport_num, u32 controller, u32 sfnum)

{
@@ -156,7 +180,8 @@ int mlx5_esw_devlink_sf_port_register(struct mlx5_eswitch *esw, struct devlink_p 
	devlink_port_attrs_pci_sf_set(dl_port, controller, pfnum, sfnum, !!controller);

	devlink = priv_to_devlink(dev);

	dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, vport_num);

	err = devl_port_register(devlink, dl_port, dl_port_index);

	err = devl_port_register_with_ops(devlink, dl_port, dl_port_index,

					  &mlx5_esw_dl_sf_port_ops);

	if (err)

		return err;

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+6 −6
Original line number Diff line number Diff line
@@ -506,10 +506,10 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, 
					struct netlink_ext_ack *extack);

int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,

					enum devlink_eswitch_encap_mode *encap);

int mlx5_devlink_port_function_hw_addr_get(struct devlink_port *port,

int mlx5_devlink_port_fn_hw_addr_get(struct devlink_port *port,

				     u8 *hw_addr, int *hw_addr_len,

				     struct netlink_ext_ack *extack);

int mlx5_devlink_port_function_hw_addr_set(struct devlink_port *port,

int mlx5_devlink_port_fn_hw_addr_set(struct devlink_port *port,

				     const u8 *hw_addr, int hw_addr_len,

				     struct netlink_ext_ack *extack);

int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled,