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

net/mlx5: E-switch, Prepare code to handle vport enable error 



In subsequent patch, esw_enable_vport() could fail and return error.
Prepare code to handle such error.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarVu Pham <vuhuong@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 77b09430

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

+45 −17
Original line number Diff line number Diff line
@@ -452,6 +452,13 @@ static int esw_create_legacy_table(struct mlx5_eswitch *esw) 
	return err;

}



static void esw_destroy_legacy_table(struct mlx5_eswitch *esw)

{

	esw_cleanup_vepa_rules(esw);

	esw_destroy_legacy_fdb_table(esw);

	esw_destroy_legacy_vepa_table(esw);

}



#define MLX5_LEGACY_SRIOV_VPORT_EVENTS (MLX5_VPORT_UC_ADDR_CHANGE | \

					MLX5_VPORT_MC_ADDR_CHANGE | \

					MLX5_VPORT_PROMISC_CHANGE)
@@ -464,15 +471,10 @@ static int esw_legacy_enable(struct mlx5_eswitch *esw) 
	if (ret)

		return ret;



	mlx5_eswitch_enable_pf_vf_vports(esw, MLX5_LEGACY_SRIOV_VPORT_EVENTS);

	return 0;

}



static void esw_destroy_legacy_table(struct mlx5_eswitch *esw)

{

	esw_cleanup_vepa_rules(esw);

	esw_destroy_legacy_fdb_table(esw);

	esw_destroy_legacy_vepa_table(esw);

	ret = mlx5_eswitch_enable_pf_vf_vports(esw, MLX5_LEGACY_SRIOV_VPORT_EVENTS);

	if (ret)

		esw_destroy_legacy_table(esw);

	return ret;

}



static void esw_legacy_disable(struct mlx5_eswitch *esw)
@@ -1704,7 +1706,7 @@ static void esw_legacy_vport_destroy_drop_counters(struct mlx5_vport *vport) 
		mlx5_fc_destroy(dev, vport->egress.legacy.drop_counter);

}



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

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

			    enum mlx5_eswitch_vport_event enabled_events)

{

	u16 vport_num = vport->vport;
@@ -1743,6 +1745,7 @@ static void esw_enable_vport(struct mlx5_eswitch *esw, struct mlx5_vport *vport, 
	esw->enabled_vports++;

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

	mutex_unlock(&esw->state_lock);

	return 0;

}



static void esw_disable_vport(struct mlx5_eswitch *esw,
@@ -1856,26 +1859,51 @@ static void mlx5_eswitch_event_handlers_unregister(struct mlx5_eswitch *esw) 
/* mlx5_eswitch_enable_pf_vf_vports() enables vports of PF, ECPF and VFs

 * whichever are present on the eswitch.

 */

void

int

mlx5_eswitch_enable_pf_vf_vports(struct mlx5_eswitch *esw,

				 enum mlx5_eswitch_vport_event enabled_events)

{

	struct mlx5_vport *vport;

	int num_vfs;

	int ret;

	int i;



	/* Enable PF vport */

	vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_PF);

	esw_enable_vport(esw, vport, enabled_events);

	ret = esw_enable_vport(esw, vport, enabled_events);

	if (ret)

		return ret;



	/* Enable ECPF vports */

	/* Enable ECPF vport */

	if (mlx5_ecpf_vport_exists(esw->dev)) {

		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_ECPF);

		esw_enable_vport(esw, vport, enabled_events);

		ret = esw_enable_vport(esw, vport, enabled_events);

		if (ret)

			goto ecpf_err;

	}



	/* Enable VF vports */

	mlx5_esw_for_each_vf_vport(esw, i, vport, esw->esw_funcs.num_vfs)

		esw_enable_vport(esw, vport, enabled_events);

	mlx5_esw_for_each_vf_vport(esw, i, vport, esw->esw_funcs.num_vfs) {

		ret = esw_enable_vport(esw, vport, enabled_events);

		if (ret)

			goto vf_err;

	}

	return 0;



vf_err:

	num_vfs = i - 1;

	mlx5_esw_for_each_vf_vport_reverse(esw, i, vport, num_vfs)

		esw_disable_vport(esw, vport);



	if (mlx5_ecpf_vport_exists(esw->dev)) {

		vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_ECPF);

		esw_disable_vport(esw, vport);

	}



ecpf_err:

	vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_PF);

	esw_disable_vport(esw, vport);

	return ret;

}



/* mlx5_eswitch_disable_pf_vf_vports() disables vports of PF, ECPF and VFs

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

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ bool mlx5_eswitch_is_vf_vport(const struct mlx5_eswitch *esw, u16 vport_num); 
void mlx5_eswitch_update_num_of_vfs(struct mlx5_eswitch *esw, const int num_vfs);

int mlx5_esw_funcs_changed_handler(struct notifier_block *nb, unsigned long type, void *data);



void

int

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);

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

+4 −1
Original line number Diff line number Diff line
@@ -2139,7 +2139,9 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) 
	if (err)

		goto err_vport_metadata;



	mlx5_eswitch_enable_pf_vf_vports(esw, MLX5_VPORT_UC_ADDR_CHANGE);

	err = mlx5_eswitch_enable_pf_vf_vports(esw, MLX5_VPORT_UC_ADDR_CHANGE);

	if (err)

		goto err_vports;



	err = esw_offloads_load_all_reps(esw);

	if (err)
@@ -2152,6 +2154,7 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) 


err_reps:

	mlx5_eswitch_disable_pf_vf_vports(esw);

err_vports:

	esw_set_passing_vport_metadata(esw, false);

err_vport_metadata:

	esw_offloads_steering_cleanup(esw);

CRA Git | Maintained and supported by SUSTech CRA and CCSE