Skip to content

Commit

Permalink
net/mlx5e: Ignore attempts to offload multiple times a TC flow
Browse files Browse the repository at this point in the history
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: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Paul Blakey <paulb@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
  • Loading branch information
Or Gerlitz authored and Saeed Mahameed committed May 18, 2018
1 parent 655dc3d commit 8f8ae89
Showing 1 changed file with 19 additions and 2 deletions.
21 changes: 19 additions & 2 deletions drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -2728,14 +2734,25 @@ int mlx5e_configure_flower(struct mlx5e_priv *priv,
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)
{
struct rhashtable *tc_ht = get_tc_ht(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);
Expand All @@ -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))
Expand Down

0 comments on commit 8f8ae89

Please sign in to comment.