Commit d7c92cb5 authored by Bodong Wang's avatar Bodong Wang Committed by Saeed Mahameed
Browse files

net/mlx5: E-switch, Make vport setup/cleanup sequence symmetric 



Vport enable and disable sequence is incorrect. It should be:
  enable()
  esw_vport_setup_acl,
  esw_vport_setup,
  esw_vport_enable_qos.

  disable()
  esw_vport_disable_qos,
  esw_vport_cleanup,
  esw_vport_cleanup_acl.

Instead of having two setup functions for port and acl, merge
acl setup to port setup function.

Signed-off-by: default avatarBodong Wang <bodong@mellanox.com>
Reviewed-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 878a7331

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

+53 −48
Original line number Diff line number Diff line
@@ -1670,45 +1670,6 @@ static void node_guid_gen_from_mac(u64 *node_guid, u8 mac[ETH_ALEN]) 
	((u8 *)node_guid)[0] = mac[5];

}



static void esw_vport_setup(struct mlx5_eswitch *esw, struct mlx5_vport *vport)

{

	u16 vport_num = vport->vport;

	int flags;



	if (mlx5_esw_is_manager_vport(esw, vport_num))

		return;



	mlx5_modify_vport_admin_state(esw->dev,

				      MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,

				      vport_num, 1,

				      vport->info.link_state);



	/* Host PF has its own mac/guid. */

	if (vport_num) {

		mlx5_modify_nic_vport_mac_address(esw->dev, vport_num,

						  vport->info.mac);

		mlx5_modify_nic_vport_node_guid(esw->dev, vport_num,

						vport->info.node_guid);

	}



	flags = (vport->info.vlan || vport->info.qos) ?

		SET_VLAN_STRIP | SET_VLAN_INSERT : 0;

	modify_esw_vport_cvlan(esw->dev, vport_num, vport->info.vlan, vport->info.qos,

			       flags);

}



/* Don't cleanup vport->info, it's needed to restore vport configuration */

static void esw_vport_cleanup(struct mlx5_eswitch *esw, struct mlx5_vport *vport)

{

	u16 vport_num = vport->vport;



	if (!mlx5_esw_is_manager_vport(esw, vport_num))

		mlx5_modify_vport_admin_state(esw->dev,

					      MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,

					      vport_num, 1,

					      MLX5_VPORT_ADMIN_STATE_DOWN);

}



static int esw_vport_create_legacy_acl_tables(struct mlx5_eswitch *esw,

					      struct mlx5_vport *vport)

{
@@ -1793,6 +1754,58 @@ static void esw_vport_cleanup_acl(struct mlx5_eswitch *esw, 
		esw_vport_destroy_offloads_acl_tables(esw, vport);

}



static int esw_vport_setup(struct mlx5_eswitch *esw, struct mlx5_vport *vport)

{

	u16 vport_num = vport->vport;

	int flags;

	int err;



	err = esw_vport_setup_acl(esw, vport);

	if (err)

		return err;



	/* Attach vport to the eswitch rate limiter */

	esw_vport_enable_qos(esw, vport, vport->info.max_rate, vport->qos.bw_share);



	if (mlx5_esw_is_manager_vport(esw, vport_num))

		return 0;



	mlx5_modify_vport_admin_state(esw->dev,

				      MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,

				      vport_num, 1,

				      vport->info.link_state);



	/* Host PF has its own mac/guid. */

	if (vport_num) {

		mlx5_modify_nic_vport_mac_address(esw->dev, vport_num,

						  vport->info.mac);

		mlx5_modify_nic_vport_node_guid(esw->dev, vport_num,

						vport->info.node_guid);

	}



	flags = (vport->info.vlan || vport->info.qos) ?

		SET_VLAN_STRIP | SET_VLAN_INSERT : 0;

	modify_esw_vport_cvlan(esw->dev, vport_num, vport->info.vlan,

			       vport->info.qos, flags);



	return 0;

}



/* Don't cleanup vport->info, it's needed to restore vport configuration */

static void esw_vport_cleanup(struct mlx5_eswitch *esw, struct mlx5_vport *vport)

{

	u16 vport_num = vport->vport;



	if (!mlx5_esw_is_manager_vport(esw, vport_num))

		mlx5_modify_vport_admin_state(esw->dev,

					      MLX5_VPORT_STATE_OP_MOD_ESW_VPORT,

					      vport_num, 1,

					      MLX5_VPORT_ADMIN_STATE_DOWN);



	esw_vport_disable_qos(esw, vport);

	esw_vport_cleanup_acl(esw, vport);

}



static int esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport,

			    enum mlx5_eswitch_vport_event enabled_events)

{
@@ -1804,16 +1817,10 @@ static int esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport, 


	esw_debug(esw->dev, "Enabling VPORT(%d)\n", vport_num);



	/* Restore old vport configuration */

	esw_vport_setup(esw, vport);



	ret = esw_vport_setup_acl(esw, vport);

	ret = esw_vport_setup(esw, vport);

	if (ret)

		goto done;



	/* Attach vport to the eswitch rate limiter */

	esw_vport_enable_qos(esw, vport, vport->info.max_rate, vport->qos.bw_share);



	/* Sync with current vport context */

	vport->enabled_events = enabled_events;

	vport->enabled = true;
@@ -1855,9 +1862,7 @@ static void esw_disable_vport(struct mlx5_eswitch *esw, 
	 */

	esw_vport_change_handle_locked(vport);

	vport->enabled_events = 0;

	esw_vport_disable_qos(esw, vport);

	esw_vport_cleanup(esw, vport);

	esw_vport_cleanup_acl(esw, vport);

	esw->enabled_vports--;



done:

CRA Git | Maintained and supported by SUSTech CRA and CCSE