net/mlx5e: TC, Use common function allocating flow mod hdr or encap mod hdr

Use mlx5e_tc_attach_mod_hdr() when allocating encap mod hdr and
remove mlx5e_tc_add_flow_mod_hdr() which is not being used now.

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/en/tc_tun_encap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
index 2aaf8ab857b8f29fb819d83c9054f57d76403c42..780224fd67a1df0bb045f5a409f7a968b12da121 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun_encap.c
@@ -1349,7 +1349,8 @@ static void mlx5e_invalidate_encap(struct mlx5e_priv *priv,
                        mlx5e_tc_unoffload_from_slow_path(esw, flow);
                else
                        mlx5e_tc_unoffload_fdb_rules(esw, flow, flow->attr);
-               mlx5_modify_header_dealloc(priv->mdev, attr->modify_hdr);
+
+               mlx5e_tc_detach_mod_hdr(priv, flow, attr);
                attr->modify_hdr = NULL;
 
                esw_attr->dests[flow->tmp_entry_index].flags &=
@@ -1405,7 +1406,7 @@ static void mlx5e_reoffload_encap(struct mlx5e_priv *priv,
                        continue;
                }
 
-               err = mlx5e_tc_add_flow_mod_hdr(priv, flow, attr);
+               err = mlx5e_tc_attach_mod_hdr(priv, flow, attr);
                if (err) {
                        mlx5_core_warn(priv->mdev, "Failed to update flow mod_hdr err=%d",
                                       err);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 6a15d3e1741efadf1f105b65fbdd51584c75ab8b..c978f4b12131419af003becb6707416f88ba40a9 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -646,9 +646,9 @@ get_mod_hdr_table(struct mlx5e_priv *priv, struct mlx5e_tc_flow *flow)
                &tc->mod_hdr;
 }
 
-static int mlx5e_tc_attach_mod_hdr(struct mlx5e_priv *priv,
-                                  struct mlx5e_tc_flow *flow,
-                                  struct mlx5_flow_attr *attr)
+int mlx5e_tc_attach_mod_hdr(struct mlx5e_priv *priv,
+                           struct mlx5e_tc_flow *flow,
+                           struct mlx5_flow_attr *attr)
 {
        struct mlx5e_mod_hdr_handle *mh;
 
@@ -665,9 +665,9 @@ static int mlx5e_tc_attach_mod_hdr(struct mlx5e_priv *priv,
        return 0;
 }
 
-static void mlx5e_tc_detach_mod_hdr(struct mlx5e_priv *priv,
-                                   struct mlx5e_tc_flow *flow,
-                                   struct mlx5_flow_attr *attr)
+void mlx5e_tc_detach_mod_hdr(struct mlx5e_priv *priv,
+                            struct mlx5e_tc_flow *flow,
+                            struct mlx5_flow_attr *attr)
 {
        /* flow wasn't fully initialized */
        if (!attr->mh)
@@ -1762,26 +1762,6 @@ int mlx5e_tc_query_route_vport(struct net_device *out_dev, struct net_device *ro
        return err;
 }
 
-int mlx5e_tc_add_flow_mod_hdr(struct mlx5e_priv *priv,
-                             struct mlx5e_tc_flow *flow,
-                             struct mlx5_flow_attr *attr)
-{
-       struct mlx5e_tc_mod_hdr_acts *mod_hdr_acts = &attr->parse_attr->mod_hdr_acts;
-       struct mlx5_modify_hdr *mod_hdr;
-
-       mod_hdr = mlx5_modify_header_alloc(priv->mdev,
-                                          mlx5e_get_flow_namespace(flow),
-                                          mod_hdr_acts->num_actions,
-                                          mod_hdr_acts->actions);
-       if (IS_ERR(mod_hdr))
-               return PTR_ERR(mod_hdr);
-
-       WARN_ON(attr->modify_hdr);
-       attr->modify_hdr = mod_hdr;
-
-       return 0;
-}
-
 static int
 set_encap_dests(struct mlx5e_priv *priv,
                struct mlx5e_tc_flow *flow,
@@ -1901,7 +1881,6 @@ verify_attr_actions(u32 actions, struct netlink_ext_ack *extack)
 static int
 post_process_attr(struct mlx5e_tc_flow *flow,
                  struct mlx5_flow_attr *attr,
-                 bool is_post_act_attr,
                  struct netlink_ext_ack *extack)
 {
        struct mlx5_eswitch *esw = flow->priv->mdev->priv.eswitch;
@@ -1923,27 +1902,21 @@ post_process_attr(struct mlx5e_tc_flow *flow,
        }
 
        if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
-               if (vf_tun || is_post_act_attr) {
-                       err = mlx5e_tc_add_flow_mod_hdr(flow->priv, flow, attr);
-                       if (err)
-                               goto err_out;
-               } else {
-                       err = mlx5e_tc_attach_mod_hdr(flow->priv, flow, attr);
-                       if (err)
-                               goto err_out;
-               }
+               err = mlx5e_tc_attach_mod_hdr(flow->priv, flow, attr);
+               if (err)
+                       goto err_out;
        }
 
        if (attr->branch_true &&
            attr->branch_true->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
-               err = mlx5e_tc_add_flow_mod_hdr(flow->priv, flow, attr->branch_true);
+               err = mlx5e_tc_attach_mod_hdr(flow->priv, flow, attr->branch_true);
                if (err)
                        goto err_out;
        }
 
        if (attr->branch_false &&
            attr->branch_false->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
-               err = mlx5e_tc_add_flow_mod_hdr(flow->priv, flow, attr->branch_false);
+               err = mlx5e_tc_attach_mod_hdr(flow->priv, flow, attr->branch_false);
                if (err)
                        goto err_out;
        }
@@ -2057,7 +2030,7 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv,
                esw_attr->int_port = int_port;
        }
 
-       err = post_process_attr(flow, attr, false, extack);
+       err = post_process_attr(flow, attr, extack);
        if (err)
                goto err_out;
 
@@ -2142,10 +2115,7 @@ static void mlx5e_tc_del_fdb_flow(struct mlx5e_priv *priv,
 
        if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
                mlx5e_mod_hdr_dealloc(&attr->parse_attr->mod_hdr_acts);
-               if (vf_tun && attr->modify_hdr)
-                       mlx5_modify_header_dealloc(priv->mdev, attr->modify_hdr);
-               else
-                       mlx5e_tc_detach_mod_hdr(priv, flow, attr);
+               mlx5e_tc_detach_mod_hdr(priv, flow, attr);
        }
 
        if (attr->action & MLX5_FLOW_CONTEXT_ACTION_COUNT)
@@ -3964,7 +3934,7 @@ alloc_flow_post_acts(struct mlx5e_tc_flow *flow, struct netlink_ext_ack *extack)
                if (err)
                        goto out_free;
 
-               err = post_process_attr(flow, attr, true, extack);
+               err = post_process_attr(flow, attr, extack);
                if (err)
                        goto out_free;
 
@@ -4531,8 +4501,7 @@ mlx5_free_flow_attr(struct mlx5e_tc_flow *flow, struct mlx5_flow_attr *attr)
 
        if (attr->action & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR) {
                mlx5e_mod_hdr_dealloc(&attr->parse_attr->mod_hdr_acts);
-               if (attr->modify_hdr)
-                       mlx5_modify_header_dealloc(flow->priv->mdev, attr->modify_hdr);
+               mlx5e_tc_detach_mod_hdr(flow->priv, flow, attr);
        }
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
index 01d76ff673158ddf111330bb763cc05363a42656..66e8d9d89082df437b3c0f95b617fe8f6bead32b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
@@ -287,9 +287,13 @@ int mlx5e_tc_match_to_reg_set_and_get_id(struct mlx5_core_dev *mdev,
                                         enum mlx5e_tc_attr_to_reg type,
                                         u32 data);
 
-int mlx5e_tc_add_flow_mod_hdr(struct mlx5e_priv *priv,
-                             struct mlx5e_tc_flow *flow,
-                             struct mlx5_flow_attr *attr);
+int mlx5e_tc_attach_mod_hdr(struct mlx5e_priv *priv,
+                           struct mlx5e_tc_flow *flow,
+                           struct mlx5_flow_attr *attr);
+
+void mlx5e_tc_detach_mod_hdr(struct mlx5e_priv *priv,
+                            struct mlx5e_tc_flow *flow,
+                            struct mlx5_flow_attr *attr);
 
 void mlx5e_tc_set_ethertype(struct mlx5_core_dev *mdev,
                            struct flow_match_basic *match, bool outer,