net/mlx5e: Add goto to tc action infra

Add parsing support by implementing struct mlx5e_tc_act
for this action.

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

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/Makefile b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
index 46eb3f7..0f3dd6e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@ -48,7 +48,7 @@ mlx5_core-$(CONFIG_MLX5_CLS_ACT)     += en_tc.o en/rep/tc.o en/rep/neigh.o \
                                        en/tc/post_act.o en/tc/int_port.o
 
 mlx5_core-$(CONFIG_MLX5_CLS_ACT)     += en/tc/act/act.o en/tc/act/drop.o en/tc/act/trap.o \
-                                       en/tc/act/accept.o en/tc/act/mark.o
+                                       en/tc/act/accept.o en/tc/act/mark.o en/tc/act/goto.o
 
 mlx5_core-$(CONFIG_MLX5_TC_CT)      += en/tc_ct.o
 mlx5_core-$(CONFIG_MLX5_TC_SAMPLE)   += en/tc/sample.o

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c
index 3f94085..6be1d1c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.c
@@ -10,6 +10,7 @@ static struct mlx5e_tc_act *tc_acts_fdb[NUM_FLOW_ACTIONS] = {
        &mlx5e_tc_act_accept,
        &mlx5e_tc_act_drop,
        &mlx5e_tc_act_trap,
+       &mlx5e_tc_act_goto,
 };
 
 /* Must be aligned with enum flow_action_id. */
@@ -17,7 +18,7 @@ static struct mlx5e_tc_act *tc_acts_nic[NUM_FLOW_ACTIONS] = {
        &mlx5e_tc_act_accept,
        &mlx5e_tc_act_drop,
        NULL, /* FLOW_ACTION_TRAP, */
-       NULL, /* FLOW_ACTION_GOTO, */
+       &mlx5e_tc_act_goto,
        NULL, /* FLOW_ACTION_REDIRECT, */
        NULL, /* FLOW_ACTION_MIRRED, */
        NULL, /* FLOW_ACTION_REDIRECT_INGRESS, */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
index 70bc7b1..b72fc0c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/act.h
@@ -31,6 +31,7 @@ extern struct mlx5e_tc_act mlx5e_tc_act_drop;
 extern struct mlx5e_tc_act mlx5e_tc_act_trap;
 extern struct mlx5e_tc_act mlx5e_tc_act_accept;
 extern struct mlx5e_tc_act mlx5e_tc_act_mark;
+extern struct mlx5e_tc_act mlx5e_tc_act_goto;
 
 struct mlx5e_tc_act *
 mlx5e_tc_act_get(enum flow_action_id act_id,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c
new file mode 100644 (file)
index 0000000..d713cf8
--- /dev/null
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc/act/goto.c
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+// Copyright (c) 2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+
+#include "act.h"
+#include "en/tc_priv.h"
+#include "eswitch.h"
+
+static int
+validate_goto_chain(struct mlx5e_priv *priv,
+                   struct mlx5e_tc_flow *flow,
+                   const struct flow_action_entry *act,
+                   struct netlink_ext_ack *extack)
+{
+       bool is_esw = mlx5e_is_eswitch_flow(flow);
+       bool ft_flow = mlx5e_is_ft_flow(flow);
+       u32 dest_chain = act->chain_index;
+       struct mlx5_fs_chains *chains;
+       struct mlx5_eswitch *esw;
+       u32 reformat_and_fwd;
+       u32 max_chain;
+
+       esw = priv->mdev->priv.eswitch;
+       chains = is_esw ? esw_chains(esw) : mlx5e_nic_chains(priv);
+       max_chain = mlx5_chains_get_chain_range(chains);
+       reformat_and_fwd = is_esw ?
+                          MLX5_CAP_ESW_FLOWTABLE_FDB(priv->mdev, reformat_and_fwd_to_table) :
+                          MLX5_CAP_FLOWTABLE_NIC_RX(priv->mdev, reformat_and_fwd_to_table);
+
+       if (ft_flow) {
+               NL_SET_ERR_MSG_MOD(extack, "Goto action is not supported");
+               return -EOPNOTSUPP;
+       }
+
+       if (!mlx5_chains_backwards_supported(chains) &&
+           dest_chain <= flow->attr->chain) {
+               NL_SET_ERR_MSG_MOD(extack, "Goto lower numbered chain isn't supported");
+               return -EOPNOTSUPP;
+       }
+
+       if (dest_chain > max_chain) {
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Requested destination chain is out of supported range");
+               return -EOPNOTSUPP;
+       }
+
+       if (flow->attr->action & (MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT |
+                                 MLX5_FLOW_CONTEXT_ACTION_DECAP) &&
+           !reformat_and_fwd) {
+               NL_SET_ERR_MSG_MOD(extack,
+                                  "Goto chain is not allowed if action has reformat or decap");
+               return -EOPNOTSUPP;
+       }
+
+       return 0;
+}
+
+static bool
+tc_act_can_offload_goto(struct mlx5e_tc_act_parse_state *parse_state,
+                       const struct flow_action_entry *act,
+                       int act_index)
+{
+       struct netlink_ext_ack *extack = parse_state->extack;
+       struct mlx5e_tc_flow *flow = parse_state->flow;
+
+       if (validate_goto_chain(flow->priv, flow, act, extack))
+               return false;
+
+       return true;
+}
+
+static int
+tc_act_parse_goto(struct mlx5e_tc_act_parse_state *parse_state,
+                 const struct flow_action_entry *act,
+                 struct mlx5e_priv *priv,
+                 struct mlx5_flow_attr *attr)
+{
+       attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
+                       MLX5_FLOW_CONTEXT_ACTION_COUNT;
+       attr->dest_chain = act->chain_index;
+
+       return 0;
+}
+
+struct mlx5e_tc_act mlx5e_tc_act_goto = {
+       .can_offload = tc_act_can_offload_goto,
+       .parse_action = tc_act_parse_goto,
+};

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
index d605746..c53871a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_priv.h
@@ -11,6 +11,8 @@
 
 #define MLX5E_TC_MAX_SPLITS 1
 
+#define mlx5e_nic_chains(priv) ((priv)->fs.tc.chains)
+
 enum {
        MLX5E_TC_FLOW_FLAG_INGRESS               = MLX5E_TC_FLAG_INGRESS_BIT,
        MLX5E_TC_FLOW_FLAG_EGRESS                = MLX5E_TC_FLAG_EGRESS_BIT,
@@ -117,6 +119,8 @@ mlx5e_tc_offload_fdb_rules(struct mlx5_eswitch *esw,
                           struct mlx5_flow_spec *spec,
                           struct mlx5_flow_attr *attr);
 
+bool mlx5e_is_eswitch_flow(struct mlx5e_tc_flow *flow);
+bool mlx5e_is_ft_flow(struct mlx5e_tc_flow *flow);
 bool mlx5e_is_offloaded_flow(struct mlx5e_tc_flow *flow);
 
 static inline void __flow_flag_set(struct mlx5e_tc_flow *flow, unsigned long flag)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 12ab29f..1455e4f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -71,8 +71,6 @@
 #include "lag/lag.h"
 #include "lag/mp.h"
 
-#define nic_chains(priv) ((priv)->fs.tc.chains)
-
 #define MLX5E_TC_TABLE_NUM_GROUPS 4
 #define MLX5E_TC_TABLE_MAX_GROUP_SIZE BIT(18)
 
@@ -400,7 +398,7 @@ bool mlx5e_is_eswitch_flow(struct mlx5e_tc_flow *flow)
        return flow_flag_test(flow, ESWITCH);
 }
 
-static bool mlx5e_is_ft_flow(struct mlx5e_tc_flow *flow)
+bool mlx5e_is_ft_flow(struct mlx5e_tc_flow *flow)
 {
        return flow_flag_test(flow, FT);
 }
@@ -938,7 +936,7 @@ mlx5e_add_offloaded_nic_rule(struct mlx5e_priv *priv,
                             struct mlx5_flow_attr *attr)
 {
        struct mlx5_flow_context *flow_context = &spec->flow_context;
-       struct mlx5_fs_chains *nic_chains = nic_chains(priv);
+       struct mlx5_fs_chains *nic_chains = mlx5e_nic_chains(priv);
        struct mlx5_nic_flow_attr *nic_attr = attr->nic_attr;
        struct mlx5e_tc_table *tc = &priv->fs.tc;
        struct mlx5_flow_destination dest[2] = {};
@@ -1092,7 +1090,7 @@ void mlx5e_del_offloaded_nic_rule(struct mlx5e_priv *priv,
                                  struct mlx5_flow_handle *rule,
                                  struct mlx5_flow_attr *attr)
 {
-       struct mlx5_fs_chains *nic_chains = nic_chains(priv);
+       struct mlx5_fs_chains *nic_chains = mlx5e_nic_chains(priv);
 
        mlx5_del_flow_rules(rule);
 
@@ -1124,7 +1122,7 @@ static void mlx5e_tc_del_nic_flow(struct mlx5e_priv *priv,
        mutex_lock(&priv->fs.tc.t_lock);
        if (!mlx5e_tc_num_filters(priv, MLX5_TC_FLAG(NIC_OFFLOAD)) &&
            !IS_ERR_OR_NULL(tc->t)) {
-               mlx5_chains_put_table(nic_chains(priv), 0, 1, MLX5E_TC_FT_LEVEL);
+               mlx5_chains_put_table(mlx5e_nic_chains(priv), 0, 1, MLX5E_TC_FT_LEVEL);
                priv->fs.tc.t = NULL;
        }
        mutex_unlock(&priv->fs.tc.t_lock);
@@ -3357,55 +3355,6 @@ add_vlan_prio_tag_rewrite_action(struct mlx5e_priv *priv,
                                       extack);
 }
 
-static int validate_goto_chain(struct mlx5e_priv *priv,
-                              struct mlx5e_tc_flow *flow,
-                              const struct flow_action_entry *act,
-                              struct netlink_ext_ack *extack)
-{
-       bool is_esw = mlx5e_is_eswitch_flow(flow);
-       bool ft_flow = mlx5e_is_ft_flow(flow);
-       u32 dest_chain = act->chain_index;
-       struct mlx5_fs_chains *chains;
-       struct mlx5_eswitch *esw;
-       u32 reformat_and_fwd;
-       u32 max_chain;
-
-       esw = priv->mdev->priv.eswitch;
-       chains = is_esw ? esw_chains(esw) : nic_chains(priv);
-       max_chain = mlx5_chains_get_chain_range(chains);
-       reformat_and_fwd = is_esw ?
-                          MLX5_CAP_ESW_FLOWTABLE_FDB(priv->mdev, reformat_and_fwd_to_table) :
-                          MLX5_CAP_FLOWTABLE_NIC_RX(priv->mdev, reformat_and_fwd_to_table);
-
-       if (ft_flow) {
-               NL_SET_ERR_MSG_MOD(extack, "Goto action is not supported");
-               return -EOPNOTSUPP;
-       }
-
-       if (!mlx5_chains_backwards_supported(chains) &&
-           dest_chain <= flow->attr->chain) {
-               NL_SET_ERR_MSG_MOD(extack,
-                                  "Goto lower numbered chain isn't supported");
-               return -EOPNOTSUPP;
-       }
-
-       if (dest_chain > max_chain) {
-               NL_SET_ERR_MSG_MOD(extack,
-                                  "Requested destination chain is out of supported range");
-               return -EOPNOTSUPP;
-       }
-
-       if (flow->attr->action & (MLX5_FLOW_CONTEXT_ACTION_PACKET_REFORMAT |
-                                 MLX5_FLOW_CONTEXT_ACTION_DECAP) &&
-           !reformat_and_fwd) {
-               NL_SET_ERR_MSG_MOD(extack,
-                                  "Goto chain is not allowed if action has reformat or decap");
-               return -EOPNOTSUPP;
-       }
-
-       return 0;
-}
-
 static int
 actions_prepare_mod_hdr_actions(struct mlx5e_priv *priv,
                                struct mlx5e_tc_flow *flow,
@@ -3533,15 +3482,6 @@ parse_tc_nic_actions(struct mlx5e_priv *priv,
                        }
                        }
                        break;
-               case FLOW_ACTION_GOTO:
-                       err = validate_goto_chain(priv, flow, act, extack);
-                       if (err)
-                               return err;
-
-                       attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
-                                       MLX5_FLOW_CONTEXT_ACTION_COUNT;
-                       attr->dest_chain = act->chain_index;
-                       break;
                case FLOW_ACTION_CT:
                        err = mlx5_tc_ct_parse_action(get_ct_priv(priv), attr,
                                                      &parse_attr->mod_hdr_acts,
@@ -4184,15 +4124,6 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv,
                case FLOW_ACTION_TUNNEL_DECAP:
                        decap = true;
                        break;
-               case FLOW_ACTION_GOTO:
-                       err = validate_goto_chain(priv, flow, act, extack);
-                       if (err)
-                               return err;
-
-                       attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
-                                       MLX5_FLOW_CONTEXT_ACTION_COUNT;
-                       attr->dest_chain = act->chain_index;
-                       break;
                case FLOW_ACTION_CT:
                        if (flow_flag_test(flow, SAMPLE)) {
                                NL_SET_ERR_MSG_MOD(extack, "Sample action with connection tracking is not supported");

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
index eb042f0..5ffae9b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
@@ -151,7 +151,6 @@ enum {
 
 int mlx5e_tc_esw_init(struct rhashtable *tc_ht);
 void mlx5e_tc_esw_cleanup(struct rhashtable *tc_ht);
-bool mlx5e_is_eswitch_flow(struct mlx5e_tc_flow *flow);
 
 int mlx5e_configure_flower(struct net_device *dev, struct mlx5e_priv *priv,
                           struct flow_cls_offload *f, unsigned long flags);