Commit 2a2c84fa authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Fix adding encap rules to slow path 



On some devices the ignore flow level cap is not supported and we
shouldn't use it. Setting the dest ft with mlx5_chains_get_tc_end_ft()
already gives the correct end ft if ignore flow level cap is supported
or not.

Fixes: 39ac237c ("net/mlx5: E-Switch, Refactor chains and priorities")
Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Reviewed-by: default avatarPaul Blakey <paulb@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent afe93f71

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

+2 −1
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ esw_setup_slow_path_dest(struct mlx5_flow_destination *dest, 
			 struct mlx5_fs_chains *chains,

			 int i)

{

	if (mlx5_chains_ignore_flow_level_supported(chains))

		flow_act->flags |= FLOW_ACT_IGNORE_FLOW_LEVEL;

	dest[i].type = MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE;

	dest[i].ft = mlx5_chains_get_tc_end_ft(chains);

drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ bool mlx5_chains_prios_supported(struct mlx5_fs_chains *chains) 
	return chains->flags & MLX5_CHAINS_AND_PRIOS_SUPPORTED;

}



static bool mlx5_chains_ignore_flow_level_supported(struct mlx5_fs_chains *chains)

bool mlx5_chains_ignore_flow_level_supported(struct mlx5_fs_chains *chains)

{

	return chains->flags & MLX5_CHAINS_IGNORE_FLOW_LEVEL_SUPPORTED;

}

drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.h

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ struct mlx5_chains_attr { 


bool

mlx5_chains_prios_supported(struct mlx5_fs_chains *chains);

bool mlx5_chains_ignore_flow_level_supported(struct mlx5_fs_chains *chains);

bool

mlx5_chains_backwards_supported(struct mlx5_fs_chains *chains);

u32
@@ -70,6 +71,10 @@ mlx5_chains_set_end_ft(struct mlx5_fs_chains *chains, 


#else /* CONFIG_MLX5_CLS_ACT */



static inline bool

mlx5_chains_ignore_flow_level_supported(struct mlx5_fs_chains *chains)

{ return false; }



static inline struct mlx5_flow_table *

mlx5_chains_get_table(struct mlx5_fs_chains *chains, u32 chain, u32 prio,

		      u32 level) { return ERR_PTR(-EOPNOTSUPP); }