net/mlx5e: Allow one failure when offloading tc encap rules under multipath

In a similar manner to uplink/VF LAG, under multipath we add encap peer
rule on the second port as well.

However, unlike the LAG case, we do want to allow failure for adding
one of the rules. This happens due to using a routing hint while doing
the route lookup when one path (next hop device) is down.

Introduce a new flag to indicate that route lookup failed for encap
flow. Note that a flow may still not be offloaded to hw due to missing
neighbour, in that case, the neigh update event will take care of it.

Signed-off-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index c2df3863e82cc7e14339a166fe91c1fb0fae50ba..7fe5f3de391788442fc3de56a914443b7bd5556b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -75,6 +75,7 @@ enum {
        MLX5E_TC_FLOW_HAIRPIN_RSS = BIT(MLX5E_TC_FLOW_BASE + 2),
        MLX5E_TC_FLOW_SLOW        = BIT(MLX5E_TC_FLOW_BASE + 3),
        MLX5E_TC_FLOW_DUP         = BIT(MLX5E_TC_FLOW_BASE + 4),
+       MLX5E_TC_FLOW_NOT_READY   = BIT(MLX5E_TC_FLOW_BASE + 5),
 };
 
 #define MLX5E_TC_MAX_SPLITS 1
@@ -1047,6 +1048,11 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv,
        struct mlx5_esw_flow_attr slow_attr;
        int out_index;
 
+       if (flow->flags & MLX5E_TC_FLOW_NOT_READY) {
+               kvfree(attr->parse_attr);
+               return;
+       }
+
        if (flow->flags & MLX5E_TC_FLOW_OFFLOADED) {
                if (flow->flags & MLX5E_TC_FLOW_SLOW)
                        mlx5e_tc_unoffload_from_slow_path(esw, flow, &slow_attr);
@@ -2800,8 +2806,12 @@ __mlx5e_add_fdb_flow(struct mlx5e_priv *priv,
                goto err_free;
 
        err = mlx5e_tc_add_fdb_flow(priv, flow, extack);
-       if (err)
-               goto err_free;
+       if (err) {
+               if (!(err == -ENETUNREACH && mlx5_lag_is_multipath(in_mdev)))
+                       goto err_free;
+
+               flow->flags |= MLX5E_TC_FLOW_NOT_READY;
+       }
 
        return flow;