Commit 8f8ae895 authored by Or Gerlitz's avatar Or Gerlitz Committed by Saeed Mahameed
Browse files

net/mlx5e: Ignore attempts to offload multiple times a TC flow 



For VF->VF and uplink->VF rules, the TC core (cls_api) attempts
to offload the same flow multiple times into the driver, b/c we
registered to the egdev callback.

Use the flow cookie to ignore attempts to add such flows, we can't
reject them (return error), b/c this will fail the offload attempt,
so we ignore that. We indentify wrong stat/del calls using the flow
ingress/egress flags, here we do return error to the core.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarPaul Blakey <paulb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 655dc3d2

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

+19 −2
Original line number Diff line number Diff line
@@ -2666,6 +2666,12 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv, 


	get_flags(flags, &flow_flags);



	flow = rhashtable_lookup_fast(tc_ht, &f->cookie, tc_ht_params);

	if (flow) {

		netdev_warn_once(priv->netdev, "flow cookie %lx already exists, ignoring\n", f->cookie);

		return 0;

	}



	if (esw && esw->mode == SRIOV_OFFLOADS) {

		flow_flags |= MLX5E_TC_FLOW_ESWITCH;

		attr_size  = sizeof(struct mlx5_esw_flow_attr);
@@ -2728,6 +2734,17 @@ err_free: 
	return err;

}



#define DIRECTION_MASK (MLX5E_TC_INGRESS | MLX5E_TC_EGRESS)

#define FLOW_DIRECTION_MASK (MLX5E_TC_FLOW_INGRESS | MLX5E_TC_FLOW_EGRESS)



static bool same_flow_direction(struct mlx5e_tc_flow *flow, int flags)

{

	if ((flow->flags & FLOW_DIRECTION_MASK) == (flags & DIRECTION_MASK))

		return true;



	return false;

}



int mlx5e_delete_flower(struct mlx5e_priv *priv,

			struct tc_cls_flower_offload *f, int flags)

{
@@ -2735,7 +2752,7 @@ int mlx5e_delete_flower(struct mlx5e_priv *priv, 
	struct mlx5e_tc_flow *flow;



	flow = rhashtable_lookup_fast(tc_ht, &f->cookie, tc_ht_params);

	if (!flow)

	if (!flow || !same_flow_direction(flow, flags))

		return -EINVAL;



	rhashtable_remove_fast(tc_ht, &flow->node, tc_ht_params);
@@ -2758,7 +2775,7 @@ int mlx5e_stats_flower(struct mlx5e_priv *priv, 
	u64 lastuse;



	flow = rhashtable_lookup_fast(tc_ht, &f->cookie, tc_ht_params);

	if (!flow)

	if (!flow || !same_flow_direction(flow, flags))

		return -EINVAL;



	if (!(flow->flags & MLX5E_TC_FLOW_OFFLOADED))

CRA Git | Maintained and supported by SUSTech CRA and CCSE