Commit d970812b authored by Parav Pandit's avatar Parav Pandit Committed by Saeed Mahameed
Browse files

net/mlx5: E-switch, Add eswitch helpers for SF vport 



Add helpers to enable/disable eswitch port, register its devlink port and
load its representor.

Signed-off-by: default avatarVu Pham <vuhuong@nvidia.com>
Signed-off-by: default avatarParav Pandit <parav@nvidia.com>
Reviewed-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent d7f33a45

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

+41 −0
Original line number Diff line number Diff line
@@ -122,3 +122,44 @@ struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u1 
	vport = mlx5_eswitch_get_vport(esw, vport_num);

	return vport->dl_port;

}



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

				      u16 vport_num, u32 sfnum)

{

	struct mlx5_core_dev *dev = esw->dev;

	struct netdev_phys_item_id ppid = {};

	unsigned int dl_port_index;

	struct mlx5_vport *vport;

	struct devlink *devlink;

	u16 pfnum;

	int err;



	vport = mlx5_eswitch_get_vport(esw, vport_num);

	if (IS_ERR(vport))

		return PTR_ERR(vport);



	pfnum = PCI_FUNC(dev->pdev->devfn);

	mlx5_esw_get_port_parent_id(dev, &ppid);

	memcpy(dl_port->attrs.switch_id.id, &ppid.id[0], ppid.id_len);

	dl_port->attrs.switch_id.id_len = ppid.id_len;

	devlink_port_attrs_pci_sf_set(dl_port, 0, pfnum, sfnum);

	devlink = priv_to_devlink(dev);

	dl_port_index = mlx5_esw_vport_to_devlink_port_index(dev, vport_num);

	err = devlink_port_register(devlink, dl_port, dl_port_index);

	if (err)

		return err;



	vport->dl_port = dl_port;

	return 0;

}



void mlx5_esw_devlink_sf_port_unregister(struct mlx5_eswitch *esw, u16 vport_num)

{

	struct mlx5_vport *vport;



	vport = mlx5_eswitch_get_vport(esw, vport_num);

	if (IS_ERR(vport))

		return;

	devlink_port_unregister(vport->dl_port);

	vport->dl_port = NULL;

}

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

+6 −6
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ static void esw_vport_cleanup(struct mlx5_eswitch *esw, struct mlx5_vport *vport 
	esw_vport_cleanup_acl(esw, vport);

}



static int esw_enable_vport(struct mlx5_eswitch *esw, u16 vport_num,

int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, u16 vport_num,

			  enum mlx5_eswitch_vport_event enabled_events)

{

	struct mlx5_vport *vport;
@@ -1309,7 +1309,7 @@ static int esw_enable_vport(struct mlx5_eswitch *esw, u16 vport_num, 
	return ret;

}



static void esw_disable_vport(struct mlx5_eswitch *esw, u16 vport_num)

void mlx5_esw_vport_disable(struct mlx5_eswitch *esw, u16 vport_num)

{

	struct mlx5_vport *vport;
@@ -1431,7 +1431,7 @@ int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num, 
{

	int err;



	err = esw_enable_vport(esw, vport_num, enabled_events);

	err = mlx5_esw_vport_enable(esw, vport_num, enabled_events);

	if (err)

		return err;
@@ -1442,14 +1442,14 @@ int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num, 
	return err;



err_rep:

	esw_disable_vport(esw, vport_num);

	mlx5_esw_vport_disable(esw, vport_num);

	return err;

}



void mlx5_eswitch_unload_vport(struct mlx5_eswitch *esw, u16 vport_num)

{

	esw_offloads_unload_rep(esw, vport_num);

	esw_disable_vport(esw, vport_num);

	mlx5_esw_vport_disable(esw, vport_num);

}



void mlx5_eswitch_unload_vf_vports(struct mlx5_eswitch *esw, u16 num_vfs)

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

+16 −0
Original line number Diff line number Diff line
@@ -688,6 +688,10 @@ mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw, 
				 enum mlx5_eswitch_vport_event enabled_events);

void mlx5_eswitch_disable_pf_vf_vports(struct mlx5_eswitch *esw);



int mlx5_esw_vport_enable(struct mlx5_eswitch *esw, u16 vport_num,

			  enum mlx5_eswitch_vport_event enabled_events);

void mlx5_esw_vport_disable(struct mlx5_eswitch *esw, u16 vport_num);



int

esw_vport_create_offloads_acl_tables(struct mlx5_eswitch *esw,

				     struct mlx5_vport *vport);
@@ -706,6 +710,9 @@ esw_get_max_restore_tag(struct mlx5_eswitch *esw); 
int esw_offloads_load_rep(struct mlx5_eswitch *esw, u16 vport_num);

void esw_offloads_unload_rep(struct mlx5_eswitch *esw, u16 vport_num);



int mlx5_esw_offloads_rep_load(struct mlx5_eswitch *esw, u16 vport_num);

void mlx5_esw_offloads_rep_unload(struct mlx5_eswitch *esw, u16 vport_num);



int mlx5_eswitch_load_vport(struct mlx5_eswitch *esw, u16 vport_num,

			    enum mlx5_eswitch_vport_event enabled_events);

void mlx5_eswitch_unload_vport(struct mlx5_eswitch *esw, u16 vport_num);
@@ -717,6 +724,15 @@ void mlx5_eswitch_unload_vf_vports(struct mlx5_eswitch *esw, u16 num_vfs); 
int mlx5_esw_offloads_devlink_port_register(struct mlx5_eswitch *esw, u16 vport_num);

void mlx5_esw_offloads_devlink_port_unregister(struct mlx5_eswitch *esw, u16 vport_num);

struct devlink_port *mlx5_esw_offloads_devlink_port(struct mlx5_eswitch *esw, u16 vport_num);



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

				      u16 vport_num, u32 sfnum);

void mlx5_esw_devlink_sf_port_unregister(struct mlx5_eswitch *esw, u16 vport_num);



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

				      u16 vport_num, u32 sfnum);

void mlx5_esw_offloads_sf_vport_disable(struct mlx5_eswitch *esw, u16 vport_num);



#else  /* CONFIG_MLX5_ESWITCH */

/* eswitch API stubs */

static inline int  mlx5_eswitch_init(struct mlx5_core_dev *dev) { return 0; }

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

+34 −2
Original line number Diff line number Diff line
@@ -1833,7 +1833,7 @@ static void __unload_reps_all_vport(struct mlx5_eswitch *esw, u8 rep_type) 
	__esw_offloads_unload_rep(esw, rep, rep_type);

}



static int mlx5_esw_offloads_rep_load(struct mlx5_eswitch *esw, u16 vport_num)

int mlx5_esw_offloads_rep_load(struct mlx5_eswitch *esw, u16 vport_num)

{

	struct mlx5_eswitch_rep *rep;

	int rep_type;
@@ -1857,7 +1857,7 @@ static int mlx5_esw_offloads_rep_load(struct mlx5_eswitch *esw, u16 vport_num) 
	return err;

}



static void mlx5_esw_offloads_rep_unload(struct mlx5_eswitch *esw, u16 vport_num)

void mlx5_esw_offloads_rep_unload(struct mlx5_eswitch *esw, u16 vport_num)

{

	struct mlx5_eswitch_rep *rep;

	int rep_type;
@@ -2835,3 +2835,35 @@ u32 mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw, 
	return vport->metadata << (32 - ESW_SOURCE_PORT_METADATA_BITS);

}

EXPORT_SYMBOL(mlx5_eswitch_get_vport_metadata_for_match);



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

				      u16 vport_num, u32 sfnum)

{

	int err;



	err = mlx5_esw_vport_enable(esw, vport_num, MLX5_VPORT_UC_ADDR_CHANGE);

	if (err)

		return err;



	err = mlx5_esw_devlink_sf_port_register(esw, dl_port, vport_num, sfnum);

	if (err)

		goto devlink_err;



	err = mlx5_esw_offloads_rep_load(esw, vport_num);

	if (err)

		goto rep_err;

	return 0;



rep_err:

	mlx5_esw_devlink_sf_port_unregister(esw, vport_num);

devlink_err:

	mlx5_esw_vport_disable(esw, vport_num);

	return err;

}



void mlx5_esw_offloads_sf_vport_disable(struct mlx5_eswitch *esw, u16 vport_num)

{

	mlx5_esw_offloads_rep_unload(esw, vport_num);

	mlx5_esw_devlink_sf_port_unregister(esw, vport_num);

	mlx5_esw_vport_disable(esw, vport_num);

}