mlxsw: core_acl_flex_keys: Add a bitmap to save which blocks are chosen

Currently, mlxsw_afk_picker() chooses which blocks will be used for a
given list of elements, and fills the blocks during the searching - when a
key block is found with most hits, it adds it and removes the elements from
the count of hits. This should be changed as we want to be able to choose
which blocks will be placed in blocks 0 to 5.

To separate between choosing blocks and filling blocks, several pre-changes
are required. The indexes of the chosen blocks should be saved, so then
the relevant blocks will be filled at the end of search.

Allocate a bitmap for chosen blocks, when a block is found with most
hits, set the relevant bit in the bitmap. This bitmap will be used in a
following patch.

Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
index 745438d8ae1051aea05d7cc9f3cc3fade08891f2..e0b4834700dd26b0fe1396d94c08a4e7d0fe6963 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
@@ -225,6 +225,7 @@ static int mlxsw_afk_picker(struct mlxsw_afk *mlxsw_afk,
                            struct mlxsw_afk_element_usage *elusage)
 {
        struct mlxsw_afk_picker *picker;
+       unsigned long *chosen_blocks_bm;
        enum mlxsw_afk_element element;
        int err;
 
@@ -232,6 +233,12 @@ static int mlxsw_afk_picker(struct mlxsw_afk *mlxsw_afk,
        if (!picker)
                return -ENOMEM;
 
+       chosen_blocks_bm = bitmap_zalloc(mlxsw_afk->blocks_count, GFP_KERNEL);
+       if (!chosen_blocks_bm) {
+               err = -ENOMEM;
+               goto err_bitmap_alloc;
+       }
+
        /* Since the same elements could be present in multiple blocks,
         * we must find out optimal block list in order to make the
         * block count as low as possible.
@@ -256,6 +263,9 @@ static int mlxsw_afk_picker(struct mlxsw_afk *mlxsw_afk,
                        err = block_index;
                        goto out;
                }
+
+               __set_bit(block_index, chosen_blocks_bm);
+
                err = mlxsw_afk_picker_key_info_add(mlxsw_afk, picker,
                                                    block_index, key_info);
                if (err)
@@ -265,6 +275,8 @@ static int mlxsw_afk_picker(struct mlxsw_afk *mlxsw_afk,
 
        err = 0;
 out:
+       bitmap_free(chosen_blocks_bm);
+err_bitmap_alloc:
        kfree(picker);
        return err;
 }