mlxsw: spectrum_trap: Do not hard code "thin" policer identifier

As explained in commit e612523041ab ("mlxsw: spectrum_trap: Introduce
dummy group with thin policer"), the purpose of the "thin" policer is to
pass as less packets as possible to the CPU.

The identifier of this policer is currently set according to the maximum
number of used trap groups, but this is fragile: On Spectrum-1 the
maximum number of policers is less than the maximum number of trap
groups, which might result in an invalid policer identifier in case the
number of used trap groups grows beyond the policer limit.

Solve this by dynamically allocating the policer identifier.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
index 78f983c1a056664c023a0eaa9a4c22a268b455c3..f4b812276a5a6f66448e120138871fb7731b481f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
@@ -441,8 +441,6 @@ static const struct mlxsw_sp_trap_item mlxsw_sp_trap_items_arr[] = {
        },
 };
 
-#define MLXSW_SP_THIN_POLICER_ID       (MLXSW_REG_HTGT_TRAP_GROUP_MAX + 1)
-
 static struct mlxsw_sp_trap_policer_item *
 mlxsw_sp_trap_policer_item_lookup(struct mlxsw_sp *mlxsw_sp, u32 id)
 {
@@ -487,14 +485,21 @@ mlxsw_sp_trap_item_lookup(struct mlxsw_sp *mlxsw_sp, u16 id)
 
 static int mlxsw_sp_trap_cpu_policers_set(struct mlxsw_sp *mlxsw_sp)
 {
+       struct mlxsw_sp_trap *trap = mlxsw_sp->trap;
        char qpcr_pl[MLXSW_REG_QPCR_LEN];
+       u16 hw_id;
 
        /* The purpose of "thin" policer is to drop as many packets
         * as possible. The dummy group is using it.
         */
-       __set_bit(MLXSW_SP_THIN_POLICER_ID, mlxsw_sp->trap->policers_usage);
-       mlxsw_reg_qpcr_pack(qpcr_pl, MLXSW_SP_THIN_POLICER_ID,
-                           MLXSW_REG_QPCR_IR_UNITS_M, false, 1, 4);
+       hw_id = find_first_zero_bit(trap->policers_usage, trap->max_policers);
+       if (WARN_ON(hw_id == trap->max_policers))
+               return -ENOBUFS;
+
+       __set_bit(hw_id, trap->policers_usage);
+       trap->thin_policer_hw_id = hw_id;
+       mlxsw_reg_qpcr_pack(qpcr_pl, hw_id, MLXSW_REG_QPCR_IR_UNITS_M,
+                           false, 1, 4);
        return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(qpcr), qpcr_pl);
 }
 
@@ -503,7 +508,7 @@ static int mlxsw_sp_trap_dummy_group_init(struct mlxsw_sp *mlxsw_sp)
        char htgt_pl[MLXSW_REG_HTGT_LEN];
 
        mlxsw_reg_htgt_pack(htgt_pl, MLXSW_REG_HTGT_TRAP_GROUP_SP_DUMMY,
-                           MLXSW_SP_THIN_POLICER_ID, 0, 1);
+                           mlxsw_sp->trap->thin_policer_hw_id, 0, 1);
        return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(htgt), htgt_pl);
 }
 

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.h
index 759146897b3a285581a2edae6b96454bd031efa4..13ac412f4d5324c58eb753b571c48adacd89903e 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.h
@@ -17,6 +17,8 @@ struct mlxsw_sp_trap {
        struct mlxsw_sp_trap_item *trap_items_arr;
        u64 traps_count; /* Number of registered traps */
 
+       u16 thin_policer_hw_id;
+
        u64 max_policers;
        unsigned long policers_usage[]; /* Usage bitmap */
 };