net/mlx5e: Don't use termination table when redundant

Current code used termination table for each vport destination
while it's only required for hairpin, i.e. uplink to uplink, or
when vlan push on rx action being used.
Fix to skip using termination table for vport destinations that
do not require it.

Signed-off-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Maor Dickman <maord@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
index edd9102583144192c91e6d5103534be02dc02469..3a9a6bb9158de2e8f4777d595f4aff700fa1db54 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
@@ -210,6 +210,18 @@ static bool mlx5_eswitch_offload_is_uplink_port(const struct mlx5_eswitch *esw,
        return (port_mask & port_value) == MLX5_VPORT_UPLINK;
 }
 
+static bool
+mlx5_eswitch_is_push_vlan_no_cap(struct mlx5_eswitch *esw,
+                                struct mlx5_flow_act *flow_act)
+{
+       if (flow_act->action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH &&
+           !(mlx5_fs_get_capabilities(esw->dev, MLX5_FLOW_NAMESPACE_FDB) &
+             MLX5_FLOW_STEERING_CAP_VLAN_PUSH_ON_RX))
+               return true;
+
+       return false;
+}
+
 bool
 mlx5_eswitch_termtbl_required(struct mlx5_eswitch *esw,
                              struct mlx5_flow_attr *attr,
@@ -225,10 +237,7 @@ mlx5_eswitch_termtbl_required(struct mlx5_eswitch *esw,
            (!mlx5_eswitch_offload_is_uplink_port(esw, spec) && !esw_attr->int_port))
                return false;
 
-       /* push vlan on RX */
-       if (flow_act->action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH &&
-           !(mlx5_fs_get_capabilities(esw->dev, MLX5_FLOW_NAMESPACE_FDB) &
-             MLX5_FLOW_STEERING_CAP_VLAN_PUSH_ON_RX))
+       if (mlx5_eswitch_is_push_vlan_no_cap(esw, flow_act))
                return true;
 
        /* hairpin */
@@ -252,19 +261,31 @@ mlx5_eswitch_add_termtbl_rule(struct mlx5_eswitch *esw,
        struct mlx5_flow_act term_tbl_act = {};
        struct mlx5_flow_handle *rule = NULL;
        bool term_table_created = false;
+       bool is_push_vlan_on_rx;
        int num_vport_dests = 0;
        int i, curr_dest;
 
+       is_push_vlan_on_rx = mlx5_eswitch_is_push_vlan_no_cap(esw, flow_act);
        mlx5_eswitch_termtbl_actions_move(flow_act, &term_tbl_act);
        term_tbl_act.action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
 
        for (i = 0; i < num_dest; i++) {
                struct mlx5_termtbl_handle *tt;
+               bool hairpin = false;
 
                /* only vport destinations can be terminated */
                if (dest[i].type != MLX5_FLOW_DESTINATION_TYPE_VPORT)
                        continue;
 
+               if (attr->dests[num_vport_dests].rep &&
+                   attr->dests[num_vport_dests].rep->vport == MLX5_VPORT_UPLINK)
+                       hairpin = true;
+
+               if (!is_push_vlan_on_rx && !hairpin) {
+                       num_vport_dests++;
+                       continue;
+               }
+
                if (attr->dests[num_vport_dests].flags & MLX5_ESW_DEST_ENCAP) {
                        term_tbl_act.action |= MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT;
                        term_tbl_act.pkt_reformat = attr->dests[num_vport_dests].pkt_reformat;
@@ -312,6 +333,9 @@ revert_changes:
        for (curr_dest = 0; curr_dest < num_vport_dests; curr_dest++) {
                struct mlx5_termtbl_handle *tt = attr->dests[curr_dest].termtbl;
 
+               if (!tt)
+                       continue;
+
                attr->dests[curr_dest].termtbl = NULL;
 
                /* search for the destination associated with the