mlxsw: Add operations structure for bloom filter calculation

Spectrum-4 will calculate hash function for bloom filter differently from
the existing ASICs.

There are two changes:
1. Instead of using one hash function to calculate 16 bits output (CRC-16),
   two functions will be used.
2. The chunks will be built differently, without padding.

As preparation for support of Spectrum-4 bloom filter, add 'ops'
structure to allow handling different calculation for different ASICs.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 5251f33af0fbe45c8df4f4e4967165f63b58a9ae..6e4265c86eb82b8f4296b4fccf048c636039b38c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3155,6 +3155,7 @@ static int mlxsw_sp2_init(struct mlxsw_core *mlxsw_core,
        mlxsw_sp->mr_tcam_ops = &mlxsw_sp2_mr_tcam_ops;
        mlxsw_sp->acl_rulei_ops = &mlxsw_sp2_acl_rulei_ops;
        mlxsw_sp->acl_tcam_ops = &mlxsw_sp2_acl_tcam_ops;
+       mlxsw_sp->acl_bf_ops = &mlxsw_sp2_acl_bf_ops;
        mlxsw_sp->nve_ops_arr = mlxsw_sp2_nve_ops_arr;
        mlxsw_sp->mac_mask = mlxsw_sp2_mac_mask;
        mlxsw_sp->sb_vals = &mlxsw_sp2_sb_vals;
@@ -3184,6 +3185,7 @@ static int mlxsw_sp3_init(struct mlxsw_core *mlxsw_core,
        mlxsw_sp->mr_tcam_ops = &mlxsw_sp2_mr_tcam_ops;
        mlxsw_sp->acl_rulei_ops = &mlxsw_sp2_acl_rulei_ops;
        mlxsw_sp->acl_tcam_ops = &mlxsw_sp2_acl_tcam_ops;
+       mlxsw_sp->acl_bf_ops = &mlxsw_sp2_acl_bf_ops;
        mlxsw_sp->nve_ops_arr = mlxsw_sp2_nve_ops_arr;
        mlxsw_sp->mac_mask = mlxsw_sp2_mac_mask;
        mlxsw_sp->sb_vals = &mlxsw_sp2_sb_vals;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index a49316d0bd3738f0cf1878d711a09db6783c7e00..e7da6c83c44250d28170da5cb856771ab9790432 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -190,6 +190,7 @@ struct mlxsw_sp {
        const struct mlxsw_sp_mr_tcam_ops *mr_tcam_ops;
        const struct mlxsw_sp_acl_rulei_ops *acl_rulei_ops;
        const struct mlxsw_sp_acl_tcam_ops *acl_tcam_ops;
+       const struct mlxsw_sp_acl_bf_ops *acl_bf_ops;
        const struct mlxsw_sp_nve_ops **nve_ops_arr;
        const struct mlxsw_sp_sb_vals *sb_vals;
        const struct mlxsw_sp_sb_ops *sb_ops;
@@ -1108,6 +1109,9 @@ extern const struct mlxsw_afk_ops mlxsw_sp1_afk_ops;
 extern const struct mlxsw_afk_ops mlxsw_sp2_afk_ops;
 extern const struct mlxsw_afk_ops mlxsw_sp4_afk_ops;
 
+/* spectrum_acl_bloom_filter.c */
+extern const struct mlxsw_sp_acl_bf_ops mlxsw_sp2_acl_bf_ops;
+
 /* spectrum_matchall.c */
 struct mlxsw_sp_mall_ops {
        int (*sample_add)(struct mlxsw_sp *mlxsw_sp,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c
index 3a3c7683b725130d66f0eb2073947852d509b583..c6dab9615a0a0482fbf78ae9b376074bef66fe9f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_bloom_filter.c
@@ -190,7 +190,7 @@ mlxsw_sp_acl_bf_entry_add(struct mlxsw_sp *mlxsw_sp,
 
        mutex_lock(&bf->lock);
 
-       bf_index = mlxsw_sp2_acl_bf_index_get(bf, aregion, aentry);
+       bf_index = mlxsw_sp->acl_bf_ops->index_get(bf, aregion, aentry);
        rule_index = mlxsw_sp_acl_bf_rule_count_index_get(bf, erp_bank,
                                                          bf_index);
 
@@ -233,7 +233,7 @@ mlxsw_sp_acl_bf_entry_del(struct mlxsw_sp *mlxsw_sp,
 
        mutex_lock(&bf->lock);
 
-       bf_index = mlxsw_sp2_acl_bf_index_get(bf, aregion, aentry);
+       bf_index = mlxsw_sp->acl_bf_ops->index_get(bf, aregion, aentry);
        rule_index = mlxsw_sp_acl_bf_rule_count_index_get(bf, erp_bank,
                                                          bf_index);
 
@@ -281,3 +281,7 @@ void mlxsw_sp_acl_bf_fini(struct mlxsw_sp_acl_bf *bf)
        mutex_destroy(&bf->lock);
        kfree(bf);
 }
+
+const struct mlxsw_sp_acl_bf_ops mlxsw_sp2_acl_bf_ops = {
+       .index_get = mlxsw_sp2_acl_bf_index_get,
+};

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h
index a41df10ade9bf41a86f4063ab51382e63954336a..edbbc89e7a719cde97a9c0045243938c2ed32102 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_tcam.h
@@ -287,6 +287,12 @@ void mlxsw_sp_acl_erps_fini(struct mlxsw_sp *mlxsw_sp,
 
 struct mlxsw_sp_acl_bf;
 
+struct mlxsw_sp_acl_bf_ops {
+       unsigned int (*index_get)(struct mlxsw_sp_acl_bf *bf,
+                                 struct mlxsw_sp_acl_atcam_region *aregion,
+                                 struct mlxsw_sp_acl_atcam_entry *aentry);
+};
+
 int
 mlxsw_sp_acl_bf_entry_add(struct mlxsw_sp *mlxsw_sp,
                          struct mlxsw_sp_acl_bf *bf,