mlxsw: spectrum_acl: Add Bloom filter update

Add Bloom filter update for rule insertion and rule removal scenarios.
This is done within eRP module in order to assure that Bloom filter
updates are done only for rules which are part of an eRP, as HW does not
consult Bloom filter for entries when there is a single (master) mask in
the region.

Signed-off-by: Nir Dotan <nird@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
index bc3c731f06a197ec8aaa14ba4a45a97d90fa1a16..1315619974e0c4144800f351f8f5a9022fd5a1ab 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c
@@ -115,6 +115,19 @@ static const struct mlxsw_sp_acl_erp_table_ops erp_no_mask_ops = {
        .erp_destroy = mlxsw_sp_acl_erp_no_mask_destroy,
 };
 
+static bool
+mlxsw_sp_acl_erp_table_is_used(const struct mlxsw_sp_acl_erp_table *erp_table)
+{
+       return erp_table->ops != &erp_single_mask_ops &&
+              erp_table->ops != &erp_no_mask_ops;
+}
+
+static unsigned int
+mlxsw_sp_acl_erp_bank_get(const struct mlxsw_sp_acl_erp *erp)
+{
+       return erp->index % erp->erp_table->erp_core->num_erp_banks;
+}
+
 static unsigned int
 mlxsw_sp_acl_erp_table_entry_size(const struct mlxsw_sp_acl_erp_table *erp_table)
 {
@@ -636,8 +649,7 @@ __mlxsw_sp_acl_erp_table_other_inc(struct mlxsw_sp_acl_erp_table *erp_table,
        /* If there are C-TCAM eRP or deltas in use we need to transition
         * the region to use eRP table, if it is not already done
         */
-       if (erp_table->ops != &erp_two_masks_ops &&
-           erp_table->ops != &erp_multiple_masks_ops) {
+       if (!mlxsw_sp_acl_erp_table_is_used(erp_table)) {
                err = mlxsw_sp_acl_erp_region_table_trans(erp_table);
                if (err)
                        return err;
@@ -961,6 +973,44 @@ void mlxsw_sp_acl_erp_mask_put(struct mlxsw_sp_acl_atcam_region *aregion,
        objagg_obj_put(aregion->erp_table->objagg, objagg_obj);
 }
 
+int mlxsw_sp_acl_erp_bf_insert(struct mlxsw_sp *mlxsw_sp,
+                              struct mlxsw_sp_acl_atcam_region *aregion,
+                              struct mlxsw_sp_acl_erp_mask *erp_mask,
+                              struct mlxsw_sp_acl_atcam_entry *aentry)
+{
+       struct objagg_obj *objagg_obj = (struct objagg_obj *) erp_mask;
+       const struct mlxsw_sp_acl_erp *erp = objagg_obj_root_priv(objagg_obj);
+       unsigned int erp_bank;
+
+       ASSERT_RTNL();
+       if (!mlxsw_sp_acl_erp_table_is_used(erp->erp_table))
+               return 0;
+
+       erp_bank = mlxsw_sp_acl_erp_bank_get(erp);
+       return mlxsw_sp_acl_bf_entry_add(mlxsw_sp,
+                                       erp->erp_table->erp_core->bf,
+                                       aregion, erp_bank, aentry);
+}
+
+void mlxsw_sp_acl_erp_bf_remove(struct mlxsw_sp *mlxsw_sp,
+                               struct mlxsw_sp_acl_atcam_region *aregion,
+                               struct mlxsw_sp_acl_erp_mask *erp_mask,
+                               struct mlxsw_sp_acl_atcam_entry *aentry)
+{
+       struct objagg_obj *objagg_obj = (struct objagg_obj *) erp_mask;
+       const struct mlxsw_sp_acl_erp *erp = objagg_obj_root_priv(objagg_obj);
+       unsigned int erp_bank;
+
+       ASSERT_RTNL();
+       if (!mlxsw_sp_acl_erp_table_is_used(erp->erp_table))
+               return;
+
+       erp_bank = mlxsw_sp_acl_erp_bank_get(erp);
+       mlxsw_sp_acl_bf_entry_del(mlxsw_sp,
+                                 erp->erp_table->erp_core->bf,
+                                 aregion, erp_bank, aentry);
+}
+
 bool
 mlxsw_sp_acl_erp_mask_is_ctcam(const struct mlxsw_sp_acl_erp_mask *erp_mask)
 {

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h
index 30ac4d0132dea78db80c7c8dd51c1248af75f60f..b649a4f9755852f72acacac7ee785d27c8d73972 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h
@@ -251,6 +251,14 @@ mlxsw_sp_acl_erp_mask_get(struct mlxsw_sp_acl_atcam_region *aregion,
                          const char *mask, bool ctcam);
 void mlxsw_sp_acl_erp_mask_put(struct mlxsw_sp_acl_atcam_region *aregion,
                               struct mlxsw_sp_acl_erp_mask *erp_mask);
+int mlxsw_sp_acl_erp_bf_insert(struct mlxsw_sp *mlxsw_sp,
+                              struct mlxsw_sp_acl_atcam_region *aregion,
+                              struct mlxsw_sp_acl_erp_mask *erp_mask,
+                              struct mlxsw_sp_acl_atcam_entry *aentry);
+void mlxsw_sp_acl_erp_bf_remove(struct mlxsw_sp *mlxsw_sp,
+                               struct mlxsw_sp_acl_atcam_region *aregion,
+                               struct mlxsw_sp_acl_erp_mask *erp_mask,
+                               struct mlxsw_sp_acl_atcam_entry *aentry);
 int mlxsw_sp_acl_erp_region_init(struct mlxsw_sp_acl_atcam_region *aregion);
 void mlxsw_sp_acl_erp_region_fini(struct mlxsw_sp_acl_atcam_region *aregion);
 int mlxsw_sp_acl_erps_init(struct mlxsw_sp *mlxsw_sp,