mlxsw: spectrum_acl: Add A-TCAM rule insertion and deletion
authorIdo Schimmel <idosch@mellanox.com>
Wed, 25 Jul 2018 06:24:05 +0000 (09:24 +0300)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Jul 2018 23:46:02 +0000 (16:46 -0700)
Implement rule insertion and deletion into the A-TCAM before we flip the
driver to start using the A-TCAM.

Rule insertion into the A-TCAM is very similar to C-TCAM, but there are
subtle differences between regions of different sizes (i.e., different
number of key blocks).

Specifically, as explained in "mlxsw: spectrum_acl: Allow encoding a
partial key", in 12 key blocks regions a rule is split into two and the
two halves of the rule are linked using a "large entry key ID".

Such differences are abstracted away by using different region
operations per region type.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_atcam.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h

index bef2329bb233627b5c2f6e15d84860956b81d6eb..aef366148cc3bef35f4804ac6fdfc74967940d70 100644 (file)
@@ -54,7 +54,7 @@ struct mlxsw_sp2_acl_tcam_chunk {
 };
 
 struct mlxsw_sp2_acl_tcam_entry {
-       struct mlxsw_sp_acl_ctcam_entry centry;
+       struct mlxsw_sp_acl_atcam_entry aentry;
        struct mlxsw_afa_block *act_block;
 };
 
@@ -185,8 +185,8 @@ static int mlxsw_sp2_acl_tcam_entry_add(struct mlxsw_sp *mlxsw_sp,
 
        entry->act_block = rulei->act_block;
        return mlxsw_sp_acl_ctcam_entry_add(mlxsw_sp, &region->aregion.cregion,
-                                           &chunk->cchunk, &entry->centry,
-                                           rulei, true);
+                                           &chunk->cchunk,
+                                           &entry->aentry.centry, rulei, true);
 }
 
 static void mlxsw_sp2_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp,
@@ -198,7 +198,7 @@ static void mlxsw_sp2_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp,
        struct mlxsw_sp2_acl_tcam_entry *entry = entry_priv;
 
        mlxsw_sp_acl_ctcam_entry_del(mlxsw_sp, &region->aregion.cregion,
-                                    &chunk->cchunk, &entry->centry);
+                                    &chunk->cchunk, &entry->aentry.centry);
 }
 
 static int
index 50b4576b49216ce970ffba00747fa9054e1b1154..d551f04312480995a927a924b5ac19cfe60ce6a3 100644 (file)
  */
 
 #include <linux/kernel.h>
+#include <linux/err.h>
 #include <linux/errno.h>
+#include <linux/gfp.h>
+#include <linux/refcount.h>
+#include <linux/rhashtable.h>
 
 #include "reg.h"
 #include "core.h"
 #include "spectrum.h"
 #include "spectrum_acl_tcam.h"
+#include "core_acl_flex_keys.h"
+
+#define MLXSW_SP_ACL_ATCAM_LKEY_ID_BLOCK_START 6
+#define MLXSW_SP_ACL_ATCAM_LKEY_ID_BLOCK_END   11
+
+struct mlxsw_sp_acl_atcam_lkey_id_ht_key {
+       char enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN]; /* MSB blocks */
+       u8 erp_id;
+};
+
+struct mlxsw_sp_acl_atcam_lkey_id {
+       struct rhash_head ht_node;
+       struct mlxsw_sp_acl_atcam_lkey_id_ht_key ht_key;
+       refcount_t refcnt;
+       u32 id;
+};
+
+struct mlxsw_sp_acl_atcam_region_ops {
+       int (*init)(struct mlxsw_sp_acl_atcam_region *aregion);
+       void (*fini)(struct mlxsw_sp_acl_atcam_region *aregion);
+       struct mlxsw_sp_acl_atcam_lkey_id *
+               (*lkey_id_get)(struct mlxsw_sp_acl_atcam_region *aregion,
+                              struct mlxsw_sp_acl_rule_info *rulei, u8 erp_id);
+       void (*lkey_id_put)(struct mlxsw_sp_acl_atcam_region *aregion,
+                           struct mlxsw_sp_acl_atcam_lkey_id *lkey_id);
+};
+
+struct mlxsw_sp_acl_atcam_region_generic {
+       struct mlxsw_sp_acl_atcam_lkey_id dummy_lkey_id;
+};
+
+struct mlxsw_sp_acl_atcam_region_12kb {
+       struct rhashtable lkey_ht;
+       unsigned int max_lkey_id;
+       unsigned long *used_lkey_id;
+};
+
+static const struct rhashtable_params mlxsw_sp_acl_atcam_lkey_id_ht_params = {
+       .key_len = sizeof(struct mlxsw_sp_acl_atcam_lkey_id_ht_key),
+       .key_offset = offsetof(struct mlxsw_sp_acl_atcam_lkey_id, ht_key),
+       .head_offset = offsetof(struct mlxsw_sp_acl_atcam_lkey_id, ht_node),
+};
+
+static const struct rhashtable_params mlxsw_sp_acl_atcam_entries_ht_params = {
+       .key_len = sizeof(struct mlxsw_sp_acl_atcam_entry_ht_key),
+       .key_offset = offsetof(struct mlxsw_sp_acl_atcam_entry, ht_key),
+       .head_offset = offsetof(struct mlxsw_sp_acl_atcam_entry, ht_node),
+};
+
+static bool
+mlxsw_sp_acl_atcam_is_centry(const struct mlxsw_sp_acl_atcam_entry *aentry)
+{
+       return mlxsw_sp_acl_erp_is_ctcam_erp(aentry->erp);
+}
+
+static int
+mlxsw_sp_acl_atcam_region_generic_init(struct mlxsw_sp_acl_atcam_region *aregion)
+{
+       struct mlxsw_sp_acl_atcam_region_generic *region_generic;
+
+       region_generic = kzalloc(sizeof(*region_generic), GFP_KERNEL);
+       if (!region_generic)
+               return -ENOMEM;
+
+       refcount_set(&region_generic->dummy_lkey_id.refcnt, 1);
+       aregion->priv = region_generic;
+
+       return 0;
+}
+
+static void
+mlxsw_sp_acl_atcam_region_generic_fini(struct mlxsw_sp_acl_atcam_region *aregion)
+{
+       kfree(aregion->priv);
+}
+
+static struct mlxsw_sp_acl_atcam_lkey_id *
+mlxsw_sp_acl_atcam_generic_lkey_id_get(struct mlxsw_sp_acl_atcam_region *aregion,
+                                      struct mlxsw_sp_acl_rule_info *rulei,
+                                      u8 erp_id)
+{
+       struct mlxsw_sp_acl_atcam_region_generic *region_generic;
+
+       region_generic = aregion->priv;
+       return &region_generic->dummy_lkey_id;
+}
+
+static void
+mlxsw_sp_acl_atcam_generic_lkey_id_put(struct mlxsw_sp_acl_atcam_region *aregion,
+                                      struct mlxsw_sp_acl_atcam_lkey_id *lkey_id)
+{
+}
+
+static const struct mlxsw_sp_acl_atcam_region_ops
+mlxsw_sp_acl_atcam_region_generic_ops = {
+       .init           = mlxsw_sp_acl_atcam_region_generic_init,
+       .fini           = mlxsw_sp_acl_atcam_region_generic_fini,
+       .lkey_id_get    = mlxsw_sp_acl_atcam_generic_lkey_id_get,
+       .lkey_id_put    = mlxsw_sp_acl_atcam_generic_lkey_id_put,
+};
+
+static int
+mlxsw_sp_acl_atcam_region_12kb_init(struct mlxsw_sp_acl_atcam_region *aregion)
+{
+       struct mlxsw_sp *mlxsw_sp = aregion->region->mlxsw_sp;
+       struct mlxsw_sp_acl_atcam_region_12kb *region_12kb;
+       size_t alloc_size;
+       u64 max_lkey_id;
+       int err;
+
+       if (!MLXSW_CORE_RES_VALID(mlxsw_sp->core, ACL_MAX_LARGE_KEY_ID))
+               return -EIO;
+
+       max_lkey_id = MLXSW_CORE_RES_GET(mlxsw_sp->core, ACL_MAX_LARGE_KEY_ID);
+       region_12kb = kzalloc(sizeof(*region_12kb), GFP_KERNEL);
+       if (!region_12kb)
+               return -ENOMEM;
+
+       alloc_size = BITS_TO_LONGS(max_lkey_id) * sizeof(unsigned long);
+       region_12kb->used_lkey_id = kzalloc(alloc_size, GFP_KERNEL);
+       if (!region_12kb->used_lkey_id) {
+               err = -ENOMEM;
+               goto err_used_lkey_id_alloc;
+       }
+
+       err = rhashtable_init(&region_12kb->lkey_ht,
+                             &mlxsw_sp_acl_atcam_lkey_id_ht_params);
+       if (err)
+               goto err_rhashtable_init;
+
+       region_12kb->max_lkey_id = max_lkey_id;
+       aregion->priv = region_12kb;
+
+       return 0;
+
+err_rhashtable_init:
+       kfree(region_12kb->used_lkey_id);
+err_used_lkey_id_alloc:
+       kfree(region_12kb);
+       return err;
+}
+
+static void
+mlxsw_sp_acl_atcam_region_12kb_fini(struct mlxsw_sp_acl_atcam_region *aregion)
+{
+       struct mlxsw_sp_acl_atcam_region_12kb *region_12kb = aregion->priv;
+
+       rhashtable_destroy(&region_12kb->lkey_ht);
+       kfree(region_12kb->used_lkey_id);
+       kfree(region_12kb);
+}
+
+static struct mlxsw_sp_acl_atcam_lkey_id *
+mlxsw_sp_acl_atcam_lkey_id_create(struct mlxsw_sp_acl_atcam_region *aregion,
+                                 struct mlxsw_sp_acl_atcam_lkey_id_ht_key *ht_key)
+{
+       struct mlxsw_sp_acl_atcam_region_12kb *region_12kb = aregion->priv;
+       struct mlxsw_sp_acl_atcam_lkey_id *lkey_id;
+       u32 id;
+       int err;
+
+       id = find_first_zero_bit(region_12kb->used_lkey_id,
+                                region_12kb->max_lkey_id);
+       if (id < region_12kb->max_lkey_id)
+               __set_bit(id, region_12kb->used_lkey_id);
+       else
+               return ERR_PTR(-ENOBUFS);
+
+       lkey_id = kzalloc(sizeof(*lkey_id), GFP_KERNEL);
+       if (!lkey_id) {
+               err = -ENOMEM;
+               goto err_lkey_id_alloc;
+       }
+
+       lkey_id->id = id;
+       memcpy(&lkey_id->ht_key, ht_key, sizeof(*ht_key));
+       refcount_set(&lkey_id->refcnt, 1);
+
+       err = rhashtable_insert_fast(&region_12kb->lkey_ht,
+                                    &lkey_id->ht_node,
+                                    mlxsw_sp_acl_atcam_lkey_id_ht_params);
+       if (err)
+               goto err_rhashtable_insert;
+
+       return lkey_id;
+
+err_rhashtable_insert:
+       kfree(lkey_id);
+err_lkey_id_alloc:
+       __clear_bit(id, region_12kb->used_lkey_id);
+       return ERR_PTR(err);
+}
+
+static void
+mlxsw_sp_acl_atcam_lkey_id_destroy(struct mlxsw_sp_acl_atcam_region *aregion,
+                                  struct mlxsw_sp_acl_atcam_lkey_id *lkey_id)
+{
+       struct mlxsw_sp_acl_atcam_region_12kb *region_12kb = aregion->priv;
+       u32 id = lkey_id->id;
+
+       rhashtable_remove_fast(&region_12kb->lkey_ht, &lkey_id->ht_node,
+                              mlxsw_sp_acl_atcam_lkey_id_ht_params);
+       kfree(lkey_id);
+       __clear_bit(id, region_12kb->used_lkey_id);
+}
+
+static struct mlxsw_sp_acl_atcam_lkey_id *
+mlxsw_sp_acl_atcam_12kb_lkey_id_get(struct mlxsw_sp_acl_atcam_region *aregion,
+                                   struct mlxsw_sp_acl_rule_info *rulei,
+                                   u8 erp_id)
+{
+       struct mlxsw_sp_acl_atcam_region_12kb *region_12kb = aregion->priv;
+       struct mlxsw_sp_acl_tcam_region *region = aregion->region;
+       struct mlxsw_sp_acl_atcam_lkey_id_ht_key ht_key = {{ 0 } };
+       struct mlxsw_sp *mlxsw_sp = region->mlxsw_sp;
+       struct mlxsw_afk *afk = mlxsw_sp_acl_afk(mlxsw_sp->acl);
+       struct mlxsw_sp_acl_atcam_lkey_id *lkey_id;
+
+       mlxsw_afk_encode(afk, region->key_info, &rulei->values, ht_key.enc_key,
+                        NULL, MLXSW_SP_ACL_ATCAM_LKEY_ID_BLOCK_START,
+                        MLXSW_SP_ACL_ATCAM_LKEY_ID_BLOCK_END);
+       ht_key.erp_id = erp_id;
+       lkey_id = rhashtable_lookup_fast(&region_12kb->lkey_ht, &ht_key,
+                                        mlxsw_sp_acl_atcam_lkey_id_ht_params);
+       if (lkey_id) {
+               refcount_inc(&lkey_id->refcnt);
+               return lkey_id;
+       }
+
+       return mlxsw_sp_acl_atcam_lkey_id_create(aregion, &ht_key);
+}
+
+static void
+mlxsw_sp_acl_atcam_12kb_lkey_id_put(struct mlxsw_sp_acl_atcam_region *aregion,
+                                   struct mlxsw_sp_acl_atcam_lkey_id *lkey_id)
+{
+       if (refcount_dec_and_test(&lkey_id->refcnt))
+               mlxsw_sp_acl_atcam_lkey_id_destroy(aregion, lkey_id);
+}
+
+static const struct mlxsw_sp_acl_atcam_region_ops
+mlxsw_sp_acl_atcam_region_12kb_ops = {
+       .init           = mlxsw_sp_acl_atcam_region_12kb_init,
+       .fini           = mlxsw_sp_acl_atcam_region_12kb_fini,
+       .lkey_id_get    = mlxsw_sp_acl_atcam_12kb_lkey_id_get,
+       .lkey_id_put    = mlxsw_sp_acl_atcam_12kb_lkey_id_put,
+};
+
+static const struct mlxsw_sp_acl_atcam_region_ops *
+mlxsw_sp_acl_atcam_region_ops_arr[] = {
+       [MLXSW_SP_ACL_ATCAM_REGION_TYPE_2KB]    =
+               &mlxsw_sp_acl_atcam_region_generic_ops,
+       [MLXSW_SP_ACL_ATCAM_REGION_TYPE_4KB]    =
+               &mlxsw_sp_acl_atcam_region_generic_ops,
+       [MLXSW_SP_ACL_ATCAM_REGION_TYPE_8KB]    =
+               &mlxsw_sp_acl_atcam_region_generic_ops,
+       [MLXSW_SP_ACL_ATCAM_REGION_TYPE_12KB]   =
+               &mlxsw_sp_acl_atcam_region_12kb_ops,
+};
 
 int mlxsw_sp_acl_atcam_region_associate(struct mlxsw_sp *mlxsw_sp,
                                        u16 region_id)
@@ -78,6 +341,7 @@ mlxsw_sp_acl_atcam_region_type_init(struct mlxsw_sp_acl_atcam_region *aregion)
                region_type = MLXSW_SP_ACL_ATCAM_REGION_TYPE_12KB;
 
        aregion->type = region_type;
+       aregion->ops = mlxsw_sp_acl_atcam_region_ops_arr[region_type];
 }
 
 int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,
@@ -91,9 +355,16 @@ int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,
        aregion->atcam = atcam;
        mlxsw_sp_acl_atcam_region_type_init(aregion);
 
-       err = mlxsw_sp_acl_erp_region_init(aregion);
+       err = rhashtable_init(&aregion->entries_ht,
+                             &mlxsw_sp_acl_atcam_entries_ht_params);
        if (err)
                return err;
+       err = aregion->ops->init(aregion);
+       if (err)
+               goto err_ops_init;
+       err = mlxsw_sp_acl_erp_region_init(aregion);
+       if (err)
+               goto err_erp_region_init;
        err = mlxsw_sp_acl_ctcam_region_init(mlxsw_sp, &aregion->cregion,
                                             region);
        if (err)
@@ -103,6 +374,10 @@ int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,
 
 err_ctcam_region_init:
        mlxsw_sp_acl_erp_region_fini(aregion);
+err_erp_region_init:
+       aregion->ops->fini(aregion);
+err_ops_init:
+       rhashtable_destroy(&aregion->entries_ht);
        return err;
 }
 
@@ -110,6 +385,172 @@ void mlxsw_sp_acl_atcam_region_fini(struct mlxsw_sp_acl_atcam_region *aregion)
 {
        mlxsw_sp_acl_ctcam_region_fini(&aregion->cregion);
        mlxsw_sp_acl_erp_region_fini(aregion);
+       aregion->ops->fini(aregion);
+       rhashtable_destroy(&aregion->entries_ht);
+}
+
+void mlxsw_sp_acl_atcam_chunk_init(struct mlxsw_sp_acl_atcam_region *aregion,
+                                  struct mlxsw_sp_acl_atcam_chunk *achunk,
+                                  unsigned int priority)
+{
+       mlxsw_sp_acl_ctcam_chunk_init(&aregion->cregion, &achunk->cchunk,
+                                     priority);
+}
+
+void mlxsw_sp_acl_atcam_chunk_fini(struct mlxsw_sp_acl_atcam_chunk *achunk)
+{
+       mlxsw_sp_acl_ctcam_chunk_fini(&achunk->cchunk);
+}
+
+static int
+mlxsw_sp_acl_atcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp,
+                                      struct mlxsw_sp_acl_atcam_region *aregion,
+                                      struct mlxsw_sp_acl_atcam_entry *aentry,
+                                      struct mlxsw_sp_acl_rule_info *rulei)
+{
+       struct mlxsw_sp_acl_tcam_region *region = aregion->region;
+       u8 erp_id = mlxsw_sp_acl_erp_id(aentry->erp);
+       struct mlxsw_sp_acl_atcam_lkey_id *lkey_id;
+       char ptce3_pl[MLXSW_REG_PTCE3_LEN];
+       u32 kvdl_index, priority;
+       int err;
+
+       err = mlxsw_sp_acl_tcam_priority_get(mlxsw_sp, rulei, &priority, true);
+       if (err)
+               return err;
+
+       lkey_id = aregion->ops->lkey_id_get(aregion, rulei, erp_id);
+       if (IS_ERR(lkey_id))
+               return PTR_ERR(lkey_id);
+       aentry->lkey_id = lkey_id;
+
+       kvdl_index = mlxsw_afa_block_first_kvdl_index(rulei->act_block);
+       mlxsw_reg_ptce3_pack(ptce3_pl, true, MLXSW_REG_PTCE3_OP_WRITE_WRITE,
+                            priority, region->tcam_region_info,
+                            aentry->ht_key.enc_key, erp_id,
+                            refcount_read(&lkey_id->refcnt) != 1, lkey_id->id,
+                            kvdl_index);
+       err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce3), ptce3_pl);
+       if (err)
+               goto err_ptce3_write;
+
+       return 0;
+
+err_ptce3_write:
+       aregion->ops->lkey_id_put(aregion, lkey_id);
+       return err;
+}
+
+static void
+mlxsw_sp_acl_atcam_region_entry_remove(struct mlxsw_sp *mlxsw_sp,
+                                      struct mlxsw_sp_acl_atcam_region *aregion,
+                                      struct mlxsw_sp_acl_atcam_entry *aentry)
+{
+       struct mlxsw_sp_acl_atcam_lkey_id *lkey_id = aentry->lkey_id;
+       struct mlxsw_sp_acl_tcam_region *region = aregion->region;
+       u8 erp_id = mlxsw_sp_acl_erp_id(aentry->erp);
+       char ptce3_pl[MLXSW_REG_PTCE3_LEN];
+
+       mlxsw_reg_ptce3_pack(ptce3_pl, false, MLXSW_REG_PTCE3_OP_WRITE_WRITE, 0,
+                            region->tcam_region_info, aentry->ht_key.enc_key,
+                            erp_id, refcount_read(&lkey_id->refcnt) != 1,
+                            lkey_id->id, 0);
+       mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce3), ptce3_pl);
+       aregion->ops->lkey_id_put(aregion, lkey_id);
+}
+
+static int
+__mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp,
+                              struct mlxsw_sp_acl_atcam_region *aregion,
+                              struct mlxsw_sp_acl_atcam_entry *aentry,
+                              struct mlxsw_sp_acl_rule_info *rulei)
+{
+       struct mlxsw_sp_acl_tcam_region *region = aregion->region;
+       char mask[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN] = { 0 };
+       struct mlxsw_afk *afk = mlxsw_sp_acl_afk(mlxsw_sp->acl);
+       struct mlxsw_sp_acl_erp *erp;
+       unsigned int blocks_count;
+       int err;
+
+       blocks_count = mlxsw_afk_key_info_blocks_count_get(region->key_info);
+       mlxsw_afk_encode(afk, region->key_info, &rulei->values,
+                        aentry->ht_key.enc_key, mask, 0, blocks_count - 1);
+
+       erp = mlxsw_sp_acl_erp_get(aregion, mask, false);
+       if (IS_ERR(erp))
+               return PTR_ERR(erp);
+       aentry->erp = erp;
+       aentry->ht_key.erp_id = mlxsw_sp_acl_erp_id(erp);
+
+       /* We can't insert identical rules into the A-TCAM, so fail and
+        * let the rule spill into C-TCAM
+        */
+       err = rhashtable_lookup_insert_fast(&aregion->entries_ht,
+                                           &aentry->ht_node,
+                                           mlxsw_sp_acl_atcam_entries_ht_params);
+       if (err)
+               goto err_rhashtable_insert;
+
+       err = mlxsw_sp_acl_atcam_region_entry_insert(mlxsw_sp, aregion, aentry,
+                                                    rulei);
+       if (err)
+               goto err_rule_insert;
+
+       return 0;
+
+err_rule_insert:
+       rhashtable_remove_fast(&aregion->entries_ht, &aentry->ht_node,
+                              mlxsw_sp_acl_atcam_entries_ht_params);
+err_rhashtable_insert:
+       mlxsw_sp_acl_erp_put(aregion, erp);
+       return err;
+}
+
+static void
+__mlxsw_sp_acl_atcam_entry_del(struct mlxsw_sp *mlxsw_sp,
+                              struct mlxsw_sp_acl_atcam_region *aregion,
+                              struct mlxsw_sp_acl_atcam_entry *aentry)
+{
+       mlxsw_sp_acl_atcam_region_entry_remove(mlxsw_sp, aregion, aentry);
+       rhashtable_remove_fast(&aregion->entries_ht, &aentry->ht_node,
+                              mlxsw_sp_acl_atcam_entries_ht_params);
+       mlxsw_sp_acl_erp_put(aregion, aentry->erp);
+}
+
+int mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp,
+                                struct mlxsw_sp_acl_atcam_region *aregion,
+                                struct mlxsw_sp_acl_atcam_chunk *achunk,
+                                struct mlxsw_sp_acl_atcam_entry *aentry,
+                                struct mlxsw_sp_acl_rule_info *rulei)
+{
+       int err;
+
+       err = __mlxsw_sp_acl_atcam_entry_add(mlxsw_sp, aregion, aentry, rulei);
+       if (!err)
+               return 0;
+
+       /* It is possible we failed to add the rule to the A-TCAM due to
+        * exceeded number of masks. Try to spill into C-TCAM.
+        */
+       err = mlxsw_sp_acl_ctcam_entry_add(mlxsw_sp, &aregion->cregion,
+                                          &achunk->cchunk, &aentry->centry,
+                                          rulei, true);
+       if (!err)
+               return 0;
+
+       return err;
+}
+
+void mlxsw_sp_acl_atcam_entry_del(struct mlxsw_sp *mlxsw_sp,
+                                 struct mlxsw_sp_acl_atcam_region *aregion,
+                                 struct mlxsw_sp_acl_atcam_chunk *achunk,
+                                 struct mlxsw_sp_acl_atcam_entry *aentry)
+{
+       if (mlxsw_sp_acl_atcam_is_centry(aentry))
+               mlxsw_sp_acl_ctcam_entry_del(mlxsw_sp, &aregion->cregion,
+                                            &achunk->cchunk, &aentry->centry);
+       else
+               __mlxsw_sp_acl_atcam_entry_del(mlxsw_sp, aregion, aentry);
 }
 
 int mlxsw_sp_acl_atcam_init(struct mlxsw_sp *mlxsw_sp,
index e26efa451d4a88af94440658549946275976f9c3..bb07723a05774fb86ade393c2096fe43a359a67a 100644 (file)
@@ -150,6 +150,11 @@ static const struct mlxsw_sp_acl_erp_table_ops erp_no_mask_ops = {
        .erp_destroy = mlxsw_sp_acl_erp_no_mask_destroy,
 };
 
+bool mlxsw_sp_acl_erp_is_ctcam_erp(const struct mlxsw_sp_acl_erp *erp)
+{
+       return erp->key.ctcam;
+}
+
 u8 mlxsw_sp_acl_erp_id(const struct mlxsw_sp_acl_erp *erp)
 {
        return erp->id;
index 718e96de28609fd71387c64af53ec4305a293b72..fb6f9a521ddbb0a160820f39870b3e9735e54b40 100644 (file)
@@ -163,11 +163,31 @@ struct mlxsw_sp_acl_atcam {
 };
 
 struct mlxsw_sp_acl_atcam_region {
+       struct rhashtable entries_ht; /* A-TCAM only */
        struct mlxsw_sp_acl_ctcam_region cregion;
+       const struct mlxsw_sp_acl_atcam_region_ops *ops;
        struct mlxsw_sp_acl_tcam_region *region;
        struct mlxsw_sp_acl_atcam *atcam;
        enum mlxsw_sp_acl_atcam_region_type type;
        struct mlxsw_sp_acl_erp_table *erp_table;
+       void *priv;
+};
+
+struct mlxsw_sp_acl_atcam_entry_ht_key {
+       char enc_key[MLXSW_REG_PTCEX_FLEX_KEY_BLOCKS_LEN]; /* Encoded key */
+       u8 erp_id;
+};
+
+struct mlxsw_sp_acl_atcam_chunk {
+       struct mlxsw_sp_acl_ctcam_chunk cchunk;
+};
+
+struct mlxsw_sp_acl_atcam_entry {
+       struct rhash_head ht_node;
+       struct mlxsw_sp_acl_atcam_entry_ht_key ht_key;
+       struct mlxsw_sp_acl_ctcam_entry centry;
+       struct mlxsw_sp_acl_atcam_lkey_id *lkey_id;
+       struct mlxsw_sp_acl_erp *erp;
 };
 
 int mlxsw_sp_acl_atcam_region_associate(struct mlxsw_sp *mlxsw_sp,
@@ -177,6 +197,19 @@ int mlxsw_sp_acl_atcam_region_init(struct mlxsw_sp *mlxsw_sp,
                                   struct mlxsw_sp_acl_atcam_region *aregion,
                                   struct mlxsw_sp_acl_tcam_region *region);
 void mlxsw_sp_acl_atcam_region_fini(struct mlxsw_sp_acl_atcam_region *aregion);
+void mlxsw_sp_acl_atcam_chunk_init(struct mlxsw_sp_acl_atcam_region *aregion,
+                                  struct mlxsw_sp_acl_atcam_chunk *achunk,
+                                  unsigned int priority);
+void mlxsw_sp_acl_atcam_chunk_fini(struct mlxsw_sp_acl_atcam_chunk *achunk);
+int mlxsw_sp_acl_atcam_entry_add(struct mlxsw_sp *mlxsw_sp,
+                                struct mlxsw_sp_acl_atcam_region *aregion,
+                                struct mlxsw_sp_acl_atcam_chunk *achunk,
+                                struct mlxsw_sp_acl_atcam_entry *aentry,
+                                struct mlxsw_sp_acl_rule_info *rulei);
+void mlxsw_sp_acl_atcam_entry_del(struct mlxsw_sp *mlxsw_sp,
+                                 struct mlxsw_sp_acl_atcam_region *aregion,
+                                 struct mlxsw_sp_acl_atcam_chunk *achunk,
+                                 struct mlxsw_sp_acl_atcam_entry *aentry);
 int mlxsw_sp_acl_atcam_init(struct mlxsw_sp *mlxsw_sp,
                            struct mlxsw_sp_acl_atcam *atcam);
 void mlxsw_sp_acl_atcam_fini(struct mlxsw_sp *mlxsw_sp,
@@ -184,6 +217,7 @@ void mlxsw_sp_acl_atcam_fini(struct mlxsw_sp *mlxsw_sp,
 
 struct mlxsw_sp_acl_erp;
 
+bool mlxsw_sp_acl_erp_is_ctcam_erp(const struct mlxsw_sp_acl_erp *erp);
 u8 mlxsw_sp_acl_erp_id(const struct mlxsw_sp_acl_erp *erp);
 struct mlxsw_sp_acl_erp *
 mlxsw_sp_acl_erp_get(struct mlxsw_sp_acl_atcam_region *aregion,