net/mlx5e: Refactor eswitch attr flags to just attr flags

The flags are flow attrs and not esw specific attr flags.
Refactor to remove the esw prefix and move from eswitch.h
to en_tc.h where struct mlx5_flow_attr exists.

Signed-off-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Oz Shlomo <ozsh@nvidia.com>
Reviewed-by: Vlad Buslov <vladbu@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c
index 84c1e87..2b53738 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/accept.c
@@ -21,7 +21,7 @@ tc_act_parse_accept(struct mlx5e_tc_act_parse_state *parse_state,
 {
        attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
                        MLX5_FLOW_CONTEXT_ACTION_COUNT;
-       attr->flags |= MLX5_ESW_ATTR_FLAG_ACCEPT;
+       attr->flags |= MLX5_ATTR_FLAG_ACCEPT;
 
        return 0;
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c
index 72811e0..9ea293f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/trap.c
@@ -28,7 +28,7 @@ tc_act_parse_trap(struct mlx5e_tc_act_parse_state *parse_state,
 {
        attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
                        MLX5_FLOW_CONTEXT_ACTION_COUNT;
-       attr->flags |= MLX5_ESW_ATTR_FLAG_SLOW_PATH;
+       attr->flags |= MLX5_ATTR_FLAG_SLOW_PATH;
 
        return 0;
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c
index 0faaf9a..7b60926 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/sample.c
@@ -403,7 +403,7 @@ add_post_rule(struct mlx5_eswitch *esw, struct mlx5e_sample_flow *sample_flow,
        post_attr->chain = 0;
        post_attr->prio = 0;
        post_attr->ft = default_tbl;
-       post_attr->flags = MLX5_ESW_ATTR_FLAG_NO_IN_PORT;
+       post_attr->flags = MLX5_ATTR_FLAG_NO_IN_PORT;
 
        /* When offloading sample and encap action, if there is no valid
         * neigh data struct, a slow path rule is offloaded first. Source
@@ -581,7 +581,7 @@ mlx5e_tc_sample_offload(struct mlx5e_tc_psample *tc_psample,
        if (tunnel_id)
                pre_attr->action |= MLX5_FLOW_CONTEXT_ACTION_DECAP;
        pre_attr->modify_hdr = sample_flow->restore->modify_hdr;
-       pre_attr->flags = MLX5_ESW_ATTR_FLAG_SAMPLE;
+       pre_attr->flags = MLX5_ATTR_FLAG_SAMPLE;
        pre_attr->inner_match_level = attr->inner_match_level;
        pre_attr->outer_match_level = attr->outer_match_level;
        pre_attr->chain = attr->chain;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
index 090e025..b7e8f20 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
@@ -809,7 +809,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv,
        attr->ft = nat ? ct_priv->ct_nat : ct_priv->ct;
        attr->outer_match_level = MLX5_MATCH_L4;
        attr->counter = entry->counter->counter;
-       attr->flags |= MLX5_ESW_ATTR_FLAG_NO_IN_PORT;
+       attr->flags |= MLX5_ATTR_FLAG_NO_IN_PORT;
        if (ct_priv->ns_type == MLX5_FLOW_NAMESPACE_FDB)
                attr->esw_attr->in_mdev = priv->mdev;
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index a1007af..d37a5f7 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -1157,7 +1157,7 @@ mlx5e_tc_offload_fdb_rules(struct mlx5_eswitch *esw,
        struct mlx5e_tc_mod_hdr_acts *mod_hdr_acts;
        struct mlx5_flow_handle *rule;
 
-       if (attr->flags & MLX5_ESW_ATTR_FLAG_SLOW_PATH)
+       if (attr->flags & MLX5_ATTR_FLAG_SLOW_PATH)
                return mlx5_eswitch_add_offloaded_rule(esw, spec, attr);
 
        if (flow_flag_test(flow, CT)) {
@@ -1196,7 +1196,7 @@ void mlx5e_tc_unoffload_fdb_rules(struct mlx5_eswitch *esw,
 {
        flow_flag_clear(flow, OFFLOADED);
 
-       if (attr->flags & MLX5_ESW_ATTR_FLAG_SLOW_PATH)
+       if (attr->flags & MLX5_ATTR_FLAG_SLOW_PATH)
                goto offload_rule_0;
 
        if (attr->esw_attr->split_count)
@@ -1226,7 +1226,7 @@ mlx5e_tc_offload_to_slow_path(struct mlx5_eswitch *esw,
        memcpy(slow_attr, flow->attr, ESW_FLOW_ATTR_SZ);
        slow_attr->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
        slow_attr->esw_attr->split_count = 0;
-       slow_attr->flags |= MLX5_ESW_ATTR_FLAG_SLOW_PATH;
+       slow_attr->flags |= MLX5_ATTR_FLAG_SLOW_PATH;
 
        rule = mlx5e_tc_offload_fdb_rules(esw, flow, spec, slow_attr);
        if (!IS_ERR(rule))
@@ -1251,7 +1251,7 @@ void mlx5e_tc_unoffload_from_slow_path(struct mlx5_eswitch *esw,
        memcpy(slow_attr, flow->attr, ESW_FLOW_ATTR_SZ);
        slow_attr->action = MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;
        slow_attr->esw_attr->split_count = 0;
-       slow_attr->flags |= MLX5_ESW_ATTR_FLAG_SLOW_PATH;
+       slow_attr->flags |= MLX5_ATTR_FLAG_SLOW_PATH;
        mlx5e_tc_unoffload_fdb_rules(esw, flow, slow_attr);
        flow_flag_clear(flow, SLOW);
        kfree(slow_attr);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
index c687302..2775159 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
@@ -89,6 +89,22 @@ struct mlx5_flow_attr {
        };
 };
 
+enum {
+       MLX5_ATTR_FLAG_VLAN_HANDLED  = BIT(0),
+       MLX5_ATTR_FLAG_SLOW_PATH     = BIT(1),
+       MLX5_ATTR_FLAG_NO_IN_PORT    = BIT(2),
+       MLX5_ATTR_FLAG_SRC_REWRITE   = BIT(3),
+       MLX5_ATTR_FLAG_SAMPLE        = BIT(4),
+       MLX5_ATTR_FLAG_ACCEPT        = BIT(5),
+};
+
+/* Returns true if any of the flags that require skipping further TC/NF processing are set. */
+static inline bool
+mlx5e_tc_attr_flags_skip(u32 attr_flags)
+{
+       return attr_flags & (MLX5_ATTR_FLAG_SLOW_PATH | MLX5_ATTR_FLAG_ACCEPT);
+}
+
 struct mlx5_rx_tun_attr {
        u16 decap_vport;
        union {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c b/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c
index c275fe0..0abef71 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/esw/indir_table.c
@@ -86,7 +86,7 @@ mlx5_esw_indir_table_needed(struct mlx5_eswitch *esw,
                mlx5_eswitch_is_vf_vport(esw, vport_num) &&
                esw->dev == dest_mdev &&
                attr->ip_version &&
-               attr->flags & MLX5_ESW_ATTR_FLAG_SRC_REWRITE;
+               attr->flags & MLX5_ATTR_FLAG_SRC_REWRITE;
 }
 
 u16

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index ead5e8a..44321cd 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -448,22 +448,6 @@ enum {
        MLX5_ESW_DEST_CHAIN_WITH_SRC_PORT_CHANGE  = BIT(2),
 };
 
-enum {
-       MLX5_ESW_ATTR_FLAG_VLAN_HANDLED  = BIT(0),
-       MLX5_ESW_ATTR_FLAG_SLOW_PATH     = BIT(1),
-       MLX5_ESW_ATTR_FLAG_NO_IN_PORT    = BIT(2),
-       MLX5_ESW_ATTR_FLAG_SRC_REWRITE   = BIT(3),
-       MLX5_ESW_ATTR_FLAG_SAMPLE        = BIT(4),
-       MLX5_ESW_ATTR_FLAG_ACCEPT        = BIT(5),
-};
-
-/* Returns true if any of the flags that require skipping further TC/NF processing are set. */
-static inline bool
-mlx5_esw_attr_flags_skip(u32 attr_flags)
-{
-       return attr_flags & (MLX5_ESW_ATTR_FLAG_SLOW_PATH | MLX5_ESW_ATTR_FLAG_ACCEPT);
-}
-
 struct mlx5_esw_flow_attr {
        struct mlx5_eswitch_rep *in_rep;
        struct mlx5_core_dev    *in_mdev;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 8642e04..133f5cf 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -180,7 +180,7 @@ esw_setup_decap_indir(struct mlx5_eswitch *esw,
 {
        struct mlx5_flow_table *ft;
 
-       if (!(attr->flags & MLX5_ESW_ATTR_FLAG_SRC_REWRITE))
+       if (!(attr->flags & MLX5_ATTR_FLAG_SRC_REWRITE))
                return -EOPNOTSUPP;
 
        ft = mlx5_esw_indir_table_get(esw, attr, spec,
@@ -297,7 +297,7 @@ esw_setup_chain_src_port_rewrite(struct mlx5_flow_destination *dest,
        struct mlx5_esw_flow_attr *esw_attr = attr->esw_attr;
        int err;
 
-       if (!(attr->flags & MLX5_ESW_ATTR_FLAG_SRC_REWRITE))
+       if (!(attr->flags & MLX5_ATTR_FLAG_SRC_REWRITE))
                return -EOPNOTSUPP;
 
        /* flow steering cannot handle more than one dest with the same ft
@@ -364,7 +364,7 @@ esw_setup_indir_table(struct mlx5_flow_destination *dest,
        struct mlx5_esw_flow_attr *esw_attr = attr->esw_attr;
        int j, err;
 
-       if (!(attr->flags & MLX5_ESW_ATTR_FLAG_SRC_REWRITE))
+       if (!(attr->flags & MLX5_ATTR_FLAG_SRC_REWRITE))
                return -EOPNOTSUPP;
 
        for (j = esw_attr->split_count; j < esw_attr->out_count; j++, (*i)++) {
@@ -463,15 +463,15 @@ esw_setup_dests(struct mlx5_flow_destination *dest,
 
        if (!mlx5_eswitch_termtbl_required(esw, attr, flow_act, spec) &&
            esw_src_port_rewrite_supported(esw))
-               attr->flags |= MLX5_ESW_ATTR_FLAG_SRC_REWRITE;
+               attr->flags |= MLX5_ATTR_FLAG_SRC_REWRITE;
 
-       if (attr->flags & MLX5_ESW_ATTR_FLAG_SAMPLE) {
+       if (attr->flags & MLX5_ATTR_FLAG_SAMPLE) {
                esw_setup_sampler_dest(dest, flow_act, attr->sample_attr.sampler_id, *i);
                (*i)++;
        } else if (attr->dest_ft) {
                esw_setup_ft_dest(dest, flow_act, esw, attr, spec, *i);
                (*i)++;
-       } else if (mlx5_esw_attr_flags_skip(attr->flags)) {
+       } else if (mlx5e_tc_attr_flags_skip(attr->flags)) {
                esw_setup_slow_path_dest(dest, flow_act, chains, *i);
                (*i)++;
        } else if (attr->dest_chain) {
@@ -498,7 +498,7 @@ esw_cleanup_dests(struct mlx5_eswitch *esw,
 
        if (attr->dest_ft) {
                esw_cleanup_decap_indir(esw, attr);
-       } else if (!mlx5_esw_attr_flags_skip(attr->flags)) {
+       } else if (!mlx5e_tc_attr_flags_skip(attr->flags)) {
                if (attr->dest_chain)
                        esw_cleanup_chain_dest(chains, attr->dest_chain, 1, 0);
                else if (esw_is_indir_table(esw, attr))
@@ -589,7 +589,7 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw,
                else
                        fdb = attr->ft;
 
-               if (!(attr->flags & MLX5_ESW_ATTR_FLAG_NO_IN_PORT))
+               if (!(attr->flags & MLX5_ATTR_FLAG_NO_IN_PORT))
                        mlx5_eswitch_set_rule_source_port(esw, spec, attr,
                                                          esw_attr->in_mdev->priv.eswitch,
                                                          esw_attr->in_rep->vport);
@@ -721,7 +721,7 @@ __mlx5_eswitch_del_rule(struct mlx5_eswitch *esw,
 
        mlx5_del_flow_rules(rule);
 
-       if (!mlx5_esw_attr_flags_skip(attr->flags)) {
+       if (!mlx5e_tc_attr_flags_skip(attr->flags)) {
                /* unref the term table */
                for (i = 0; i < MLX5_MAX_FLOW_FWD_VPORTS; i++) {
                        if (esw_attr->dests[i].termtbl)
@@ -863,7 +863,7 @@ int mlx5_eswitch_add_vlan_action(struct mlx5_eswitch *esw,
        if (err)
                goto unlock;
 
-       attr->flags &= ~MLX5_ESW_ATTR_FLAG_VLAN_HANDLED;
+       attr->flags &= ~MLX5_ATTR_FLAG_VLAN_HANDLED;
 
        vport = esw_vlan_action_get_vport(esw_attr, push, pop);
 
@@ -871,7 +871,7 @@ int mlx5_eswitch_add_vlan_action(struct mlx5_eswitch *esw,
                /* tracks VF --> wire rules without vlan push action */
                if (esw_attr->dests[0].rep->vport == MLX5_VPORT_UPLINK) {
                        vport->vlan_refcount++;
-                       attr->flags |= MLX5_ESW_ATTR_FLAG_VLAN_HANDLED;
+                       attr->flags |= MLX5_ATTR_FLAG_VLAN_HANDLED;
                }
 
                goto unlock;
@@ -902,7 +902,7 @@ skip_set_push:
        }
 out:
        if (!err)
-               attr->flags |= MLX5_ESW_ATTR_FLAG_VLAN_HANDLED;
+               attr->flags |= MLX5_ATTR_FLAG_VLAN_HANDLED;
 unlock:
        mutex_unlock(&esw->state_lock);
        return err;
@@ -921,7 +921,7 @@ int mlx5_eswitch_del_vlan_action(struct mlx5_eswitch *esw,
        if (mlx5_eswitch_vlan_actions_supported(esw->dev, 1))
                return 0;
 
-       if (!(attr->flags & MLX5_ESW_ATTR_FLAG_VLAN_HANDLED))
+       if (!(attr->flags & MLX5_ATTR_FLAG_VLAN_HANDLED))
                return 0;
 
        push = !!(attr->action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH);

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 182306b..4b354ae 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
@@ -219,7 +219,7 @@ mlx5_eswitch_termtbl_required(struct mlx5_eswitch *esw,
 
        if (!MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, termination_table) ||
            !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ignore_flow_level) ||
-           mlx5_esw_attr_flags_skip(attr->flags) ||
+           mlx5e_tc_attr_flags_skip(attr->flags) ||
            (!mlx5_eswitch_offload_is_uplink_port(esw, spec) && !esw_attr->int_port))
                return false;