net/mlx5e: TC, Set CT miss to the specific ct action instance

Currently, CT misses restore the missed chain on the tc skb extension so
tc will continue from the relevant chain. Instead, restore the CT action's
miss cookie on the extension, which will instruct tc to continue from the
this specific CT action instance on the relevant filter's action list.

Map the CT action's miss_cookie to a new miss object (ACT_MISS), and use
this miss mapping instead of the current chain miss object (CHAIN_MISS)
for CT action misses.

To restore this new miss mapping value, add a RX restore rule for each
such mapping value.

Signed-off-by: Paul Blakey <paulb@nvidia.com>
Reviewed-by: Roi Dayan <roid@nvidia.com>
Reviewed-by: Oz Sholmo <ozsh@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

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 de751d0..5c58ec2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c
@@ -59,6 +59,7 @@ struct mlx5_tc_ct_debugfs {
 
 struct mlx5_tc_ct_priv {
        struct mlx5_core_dev *dev;
+       struct mlx5e_priv *priv;
        const struct net_device *netdev;
        struct mod_hdr_tbl *mod_hdr_tbl;
        struct xarray tuple_ids;
@@ -85,7 +86,6 @@ struct mlx5_ct_flow {
        struct mlx5_flow_attr *pre_ct_attr;
        struct mlx5_flow_handle *pre_ct_rule;
        struct mlx5_ct_ft *ft;
-       u32 chain_mapping;
 };
 
 struct mlx5_ct_zone_rule {
@@ -1445,6 +1445,7 @@ mlx5_tc_ct_parse_action(struct mlx5_tc_ct_priv *priv,
        attr->ct_attr.zone = act->ct.zone;
        attr->ct_attr.ct_action = act->ct.action;
        attr->ct_attr.nf_ft = act->ct.flow_table;
+       attr->ct_attr.act_miss_cookie = act->miss_cookie;
 
        return 0;
 }
@@ -1782,7 +1783,7 @@ mlx5_tc_ct_del_ft_cb(struct mlx5_tc_ct_priv *ct_priv, struct mlx5_ct_ft *ft)
  *     + ft prio (tc chain)  +
  *     + original match      +
  *     +---------------------+
- *              | set chain miss mapping
+ *              | set act_miss_cookie mapping
  *              | set fte_id
  *              | set tunnel_id
  *              | do decap
@@ -1827,7 +1828,7 @@ __mlx5_tc_ct_flow_offload(struct mlx5_tc_ct_priv *ct_priv,
        struct mlx5_flow_attr *pre_ct_attr;
        struct mlx5_modify_hdr *mod_hdr;
        struct mlx5_ct_flow *ct_flow;
-       int chain_mapping = 0, err;
+       int act_miss_mapping = 0, err;
        struct mlx5_ct_ft *ft;
        u16 zone;
 
@@ -1862,22 +1863,18 @@ __mlx5_tc_ct_flow_offload(struct mlx5_tc_ct_priv *ct_priv,
        pre_ct_attr->action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |
                               MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;
 
-       /* Write chain miss tag for miss in ct table as we
-        * don't go though all prios of this chain as normal tc rules
-        * miss.
-        */
-       err = mlx5_chains_get_chain_mapping(ct_priv->chains, attr->chain,
-                                           &chain_mapping);
+       err = mlx5e_tc_action_miss_mapping_get(ct_priv->priv, attr, attr->ct_attr.act_miss_cookie,
+                                              &act_miss_mapping);
        if (err) {
-               ct_dbg("Failed to get chain register mapping for chain");
-               goto err_get_chain;
+               ct_dbg("Failed to get register mapping for act miss");
+               goto err_get_act_miss;
        }
-       ct_flow->chain_mapping = chain_mapping;
+       attr->ct_attr.act_miss_mapping = act_miss_mapping;
 
        err = mlx5e_tc_match_to_reg_set(priv->mdev, pre_mod_acts, ct_priv->ns_type,
-                                       MAPPED_OBJ_TO_REG, chain_mapping);
+                                       MAPPED_OBJ_TO_REG, act_miss_mapping);
        if (err) {
-               ct_dbg("Failed to set chain register mapping");
+               ct_dbg("Failed to set act miss register mapping");
                goto err_mapping;
        }
 
@@ -1941,8 +1938,8 @@ err_insert_orig:
        mlx5_modify_header_dealloc(priv->mdev, pre_ct_attr->modify_hdr);
 err_mapping:
        mlx5e_mod_hdr_dealloc(pre_mod_acts);
-       mlx5_chains_put_chain_mapping(ct_priv->chains, ct_flow->chain_mapping);
-err_get_chain:
+       mlx5e_tc_action_miss_mapping_put(ct_priv->priv, attr, act_miss_mapping);
+err_get_act_miss:
        kfree(ct_flow->pre_ct_attr);
 err_alloc_pre:
        mlx5_tc_ct_del_ft_cb(ct_priv, ft);
@@ -1981,7 +1978,7 @@ __mlx5_tc_ct_delete_flow(struct mlx5_tc_ct_priv *ct_priv,
        mlx5_tc_rule_delete(priv, ct_flow->pre_ct_rule, pre_ct_attr);
        mlx5_modify_header_dealloc(priv->mdev, pre_ct_attr->modify_hdr);
 
-       mlx5_chains_put_chain_mapping(ct_priv->chains, ct_flow->chain_mapping);
+       mlx5e_tc_action_miss_mapping_put(ct_priv->priv, attr, attr->ct_attr.act_miss_mapping);
        mlx5_tc_ct_del_ft_cb(ct_priv, ct_flow->ft);
 
        kfree(ct_flow->pre_ct_attr);
@@ -2154,6 +2151,7 @@ mlx5_tc_ct_init(struct mlx5e_priv *priv, struct mlx5_fs_chains *chains,
        }
 
        spin_lock_init(&ct_priv->ht_lock);
+       ct_priv->priv = priv;
        ct_priv->ns_type = ns_type;
        ct_priv->chains = chains;
        ct_priv->netdev = priv->netdev;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h
index 5bbd6b9..5c5ddaa 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h
@@ -28,6 +28,8 @@ struct mlx5_ct_attr {
        struct mlx5_ct_flow *ct_flow;
        struct nf_flowtable *nf_ft;
        u32 ct_labels_id;
+       u32 act_miss_mapping;
+       u64 act_miss_cookie;
 };
 
 #define zone_to_reg_ct {\

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 2dd0bd5..e34d9b5 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -3816,6 +3816,7 @@ mlx5e_clone_flow_attr_for_post_act(struct mlx5_flow_attr *attr,
        attr2->parse_attr = parse_attr;
        attr2->dest_chain = 0;
        attr2->dest_ft = NULL;
+       attr2->act_id_restore_rule = NULL;
 
        if (ns_type == MLX5_FLOW_NAMESPACE_FDB) {
                attr2->esw_attr->out_count = 0;
@@ -5699,14 +5700,19 @@ static bool mlx5e_tc_restore_tunnel(struct mlx5e_priv *priv, struct sk_buff *skb
        return true;
 }
 
-static bool mlx5e_tc_restore_skb_chain(struct sk_buff *skb, struct mlx5_tc_ct_priv *ct_priv,
-                                      u32 chain, u32 zone_restore_id,
-                                      u32 tunnel_id,  struct mlx5e_tc_update_priv *tc_priv)
+static bool mlx5e_tc_restore_skb_tc_meta(struct sk_buff *skb, struct mlx5_tc_ct_priv *ct_priv,
+                                        struct mlx5_mapped_obj *mapped_obj, u32 zone_restore_id,
+                                        u32 tunnel_id,  struct mlx5e_tc_update_priv *tc_priv)
 {
        struct mlx5e_priv *priv = netdev_priv(skb->dev);
        struct tc_skb_ext *tc_skb_ext;
+       u64 act_miss_cookie;
+       u32 chain;
 
-       if (chain) {
+       chain = mapped_obj->type == MLX5_MAPPED_OBJ_CHAIN ? mapped_obj->chain : 0;
+       act_miss_cookie = mapped_obj->type == MLX5_MAPPED_OBJ_ACT_MISS ?
+                         mapped_obj->act_miss_cookie : 0;
+       if (chain || act_miss_cookie) {
                if (!mlx5e_tc_ct_restore_flow(ct_priv, skb, zone_restore_id))
                        return false;
 
@@ -5716,7 +5722,12 @@ static bool mlx5e_tc_restore_skb_chain(struct sk_buff *skb, struct mlx5_tc_ct_pr
                        return false;
                }
 
-               tc_skb_ext->chain = chain;
+               if (act_miss_cookie) {
+                       tc_skb_ext->act_miss_cookie = act_miss_cookie;
+                       tc_skb_ext->act_miss = 1;
+               } else {
+                       tc_skb_ext->chain = chain;
+               }
        }
 
        if (tc_priv)
@@ -5786,8 +5797,9 @@ bool mlx5e_tc_update_skb(struct mlx5_cqe64 *cqe, struct sk_buff *skb,
 
        switch (mapped_obj.type) {
        case MLX5_MAPPED_OBJ_CHAIN:
-               return mlx5e_tc_restore_skb_chain(skb, ct_priv, mapped_obj.chain, zone_restore_id,
-                                                 tunnel_id, tc_priv);
+       case MLX5_MAPPED_OBJ_ACT_MISS:
+               return mlx5e_tc_restore_skb_tc_meta(skb, ct_priv, &mapped_obj, zone_restore_id,
+                                                   tunnel_id, tc_priv);
        case MLX5_MAPPED_OBJ_SAMPLE:
                mlx5e_tc_restore_skb_sample(priv, skb, &mapped_obj, tc_priv);
                tc_priv->skb_done = true;
@@ -5821,3 +5833,41 @@ bool mlx5e_tc_update_skb_nic(struct mlx5_cqe64 *cqe, struct sk_buff *skb)
        return mlx5e_tc_update_skb(cqe, skb, mapping_ctx, mapped_obj_id, ct_priv, zone_restore_id,
                                   0, NULL);
 }
+
+int mlx5e_tc_action_miss_mapping_get(struct mlx5e_priv *priv, struct mlx5_flow_attr *attr,
+                                    u64 act_miss_cookie, u32 *act_miss_mapping)
+{
+       struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
+       struct mlx5_mapped_obj mapped_obj = {};
+       struct mapping_ctx *ctx;
+       int err;
+
+       ctx = esw->offloads.reg_c0_obj_pool;
+
+       mapped_obj.type = MLX5_MAPPED_OBJ_ACT_MISS;
+       mapped_obj.act_miss_cookie = act_miss_cookie;
+       err = mapping_add(ctx, &mapped_obj, act_miss_mapping);
+       if (err)
+               return err;
+
+       attr->act_id_restore_rule = esw_add_restore_rule(esw, *act_miss_mapping);
+       if (IS_ERR(attr->act_id_restore_rule))
+               goto err_rule;
+
+       return 0;
+
+err_rule:
+       mapping_remove(ctx, *act_miss_mapping);
+       return err;
+}
+
+void mlx5e_tc_action_miss_mapping_put(struct mlx5e_priv *priv, struct mlx5_flow_attr *attr,
+                                     u32 act_miss_mapping)
+{
+       struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
+       struct mapping_ctx *ctx;
+
+       ctx = esw->offloads.reg_c0_obj_pool;
+       mlx5_del_flow_rules(attr->act_id_restore_rule);
+       mapping_remove(ctx, act_miss_mapping);
+}

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
index a46a74e..adb39e3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
@@ -97,6 +97,7 @@ struct mlx5_flow_attr {
        struct mlx5_flow_attr *branch_true;
        struct mlx5_flow_attr *branch_false;
        struct mlx5_flow_attr *jumping_attr;
+       struct mlx5_flow_handle *act_id_restore_rule;
        /* keep this union last */
        union {
                DECLARE_FLEX_ARRAY(struct mlx5_esw_flow_attr, esw_attr);
@@ -400,4 +401,9 @@ mlx5e_tc_update_skb_nic(struct mlx5_cqe64 *cqe, struct sk_buff *skb)
 { return true; }
 #endif
 
+int mlx5e_tc_action_miss_mapping_get(struct mlx5e_priv *priv, struct mlx5_flow_attr *attr,
+                                    u64 act_miss_cookie, u32 *act_miss_mapping);
+void mlx5e_tc_action_miss_mapping_put(struct mlx5e_priv *priv, struct mlx5_flow_attr *attr,
+                                     u32 act_miss_mapping);
+
 #endif /* __MLX5_EN_TC_H__ */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index fd03f07..19e9a77 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -52,12 +52,14 @@ enum mlx5_mapped_obj_type {
        MLX5_MAPPED_OBJ_CHAIN,
        MLX5_MAPPED_OBJ_SAMPLE,
        MLX5_MAPPED_OBJ_INT_PORT_METADATA,
+       MLX5_MAPPED_OBJ_ACT_MISS,
 };
 
 struct mlx5_mapped_obj {
        enum mlx5_mapped_obj_type type;
        union {
                u32 chain;
+               u64 act_miss_cookie;
                struct {
                        u32 group_id;
                        u32 rate;