net/mlx5e: Don't inherit flow flags on peer flow creation
authorRoi Dayan <roid@mellanox.com>
Tue, 19 Feb 2019 14:38:56 +0000 (16:38 +0200)
committerSaeed Mahameed <saeedm@mellanox.com>
Fri, 1 Mar 2019 20:04:16 +0000 (12:04 -0800)
Currently the peer flow inherits the flags from the original flow
after we've set it. At this time the flags are set according to
the flow state, e.g marked as going to slow path and such.

Even if not getting us to real bugs now, this opens the door to
get us to troubles later. Future proof the code and avoid the
inheritance, use the peer flags as were set on input when we
started adding the original flow.

Signed-off-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

index ea39083b1596d931dcf5c9c0e63b143ce7604a33..c2df3863e82cc7e14339a166fe91c1fb0fae50ba 100644 (file)
@@ -2813,7 +2813,8 @@ out:
 }
 
 static int mlx5e_tc_add_fdb_peer_flow(struct tc_cls_flower_offload *f,
-                                     struct mlx5e_tc_flow *flow)
+                                     struct mlx5e_tc_flow *flow,
+                                     u16 flow_flags)
 {
        struct mlx5e_priv *priv = flow->priv, *peer_priv;
        struct mlx5_eswitch *esw = priv->mdev->priv.eswitch, *peer_esw;
@@ -2842,7 +2843,7 @@ static int mlx5e_tc_add_fdb_peer_flow(struct tc_cls_flower_offload *f,
                in_mdev = priv->mdev;
 
        parse_attr = flow->esw_attr->parse_attr;
-       peer_flow = __mlx5e_add_fdb_flow(peer_priv, f, flow->flags,
+       peer_flow = __mlx5e_add_fdb_flow(peer_priv, f, flow_flags,
                                         parse_attr->filter_dev,
                                         flow->esw_attr->in_rep, in_mdev);
        if (IS_ERR(peer_flow)) {
@@ -2880,7 +2881,7 @@ mlx5e_add_fdb_flow(struct mlx5e_priv *priv,
                return PTR_ERR(flow);
 
        if (is_peer_flow_needed(flow)) {
-               err = mlx5e_tc_add_fdb_peer_flow(f, flow);
+               err = mlx5e_tc_add_fdb_peer_flow(f, flow, flow_flags);
                if (err) {
                        mlx5e_tc_del_fdb_flow(priv, flow);
                        goto out;