Commit 4e9a9ef7 authored by Vu Pham's avatar Vu Pham Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Check and enable metadata support flag before using 



Check E-Switch capabilities and enable metadata support flag
before using it to setup other features that need metadata.

Signed-off-by: default avatarVu Pham <vuhuong@mellanox.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 9b412cc3

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

+6 −9
Original line number Diff line number Diff line
@@ -1968,16 +1968,9 @@ esw_vport_destroy_offloads_acl_tables(struct mlx5_eswitch *esw, 
static int esw_create_uplink_offloads_acl_tables(struct mlx5_eswitch *esw)

{

	struct mlx5_vport *vport;

	int err;



	if (esw_use_vport_metadata(esw))

		esw->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;



	vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_UPLINK);

	err = esw_vport_create_offloads_acl_tables(esw, vport);

	if (err)

		esw->flags &= ~MLX5_ESWITCH_VPORT_MATCH_METADATA;

	return err;

	return esw_vport_create_offloads_acl_tables(esw, vport);

}



static void esw_destroy_uplink_offloads_acl_tables(struct mlx5_eswitch *esw)
@@ -1986,7 +1979,6 @@ static void esw_destroy_uplink_offloads_acl_tables(struct mlx5_eswitch *esw) 


	vport = mlx5_eswitch_get_vport(esw, MLX5_VPORT_UPLINK);

	esw_vport_destroy_offloads_acl_tables(esw, vport);

	esw->flags &= ~MLX5_ESWITCH_VPORT_MATCH_METADATA;

}



static int esw_offloads_steering_init(struct mlx5_eswitch *esw)
@@ -2146,6 +2138,9 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) 
	if (err)

		goto err_vport_metadata;



	if (esw_use_vport_metadata(esw))

		esw->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;



	err = esw_set_passing_vport_metadata(esw, true);

	if (err)

		goto err_vport_metadata;
@@ -2178,6 +2173,7 @@ int esw_offloads_enable(struct mlx5_eswitch *esw) 
err_steering_init:

	esw_set_passing_vport_metadata(esw, false);

err_vport_metadata:

	esw->flags &= ~MLX5_ESWITCH_VPORT_MATCH_METADATA;

	mlx5_rdma_disable_roce(esw->dev);

	mutex_destroy(&esw->offloads.termtbl_mutex);

	return err;
@@ -2211,6 +2207,7 @@ void esw_offloads_disable(struct mlx5_eswitch *esw) 
	esw_offloads_unload_rep(esw, MLX5_VPORT_UPLINK);

	esw_set_passing_vport_metadata(esw, false);

	esw_offloads_steering_cleanup(esw);

	esw->flags &= ~MLX5_ESWITCH_VPORT_MATCH_METADATA;

	mlx5_rdma_disable_roce(esw->dev);

	mutex_destroy(&esw->offloads.termtbl_mutex);

	esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;