devlink: Add packet trap group parameters support

Packet trap groups are used to aggregate logically related packet traps.
Currently, these groups allow user space to batch operations such as
setting the trap action of all member traps.

In order to prevent the CPU from being overwhelmed by too many trapped
packets, it is desirable to bind a packet trap policer to these groups.
For example, to limit all the packets that encountered an exception
during routing to 10Kpps.

Allow device drivers to bind default packet trap policers to packet trap
groups when the latter are registered with devlink.

The next patch will enable user space to change this default binding.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
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 727f6ef243df3b45fe1886923418b8867cdbad94..24f15345ba84fd40d339283becb483aecada2c6b 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c
@@ -166,10 +166,10 @@ static void mlxsw_sp_rx_exception_listener(struct sk_buff *skb, u8 local_port,
                   _action, false, SP_##_group_id, SET_FW_DEFAULT)
 
 static const struct devlink_trap_group mlxsw_sp_trap_groups_arr[] = {
-       DEVLINK_TRAP_GROUP_GENERIC(L2_DROPS),
-       DEVLINK_TRAP_GROUP_GENERIC(L3_DROPS),
-       DEVLINK_TRAP_GROUP_GENERIC(TUNNEL_DROPS),
-       DEVLINK_TRAP_GROUP_GENERIC(ACL_DROPS),
+       DEVLINK_TRAP_GROUP_GENERIC(L2_DROPS, 0),
+       DEVLINK_TRAP_GROUP_GENERIC(L3_DROPS, 0),
+       DEVLINK_TRAP_GROUP_GENERIC(TUNNEL_DROPS, 0),
+       DEVLINK_TRAP_GROUP_GENERIC(ACL_DROPS, 0),
 };
 
 static const struct devlink_trap mlxsw_sp_traps_arr[] = {

diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 21341e5924672f96d1cc9b64b02002892dca0706..bda603cfe66a0e6c09af9ebdd1d2392d07bd4c86 100644 (file)
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -452,10 +452,10 @@ static const struct devlink_trap_policer nsim_trap_policers_arr[] = {
 };
 
 static const struct devlink_trap_group nsim_trap_groups_arr[] = {
-       DEVLINK_TRAP_GROUP_GENERIC(L2_DROPS),
-       DEVLINK_TRAP_GROUP_GENERIC(L3_DROPS),
-       DEVLINK_TRAP_GROUP_GENERIC(BUFFER_DROPS),
-       DEVLINK_TRAP_GROUP_GENERIC(ACL_DROPS),
+       DEVLINK_TRAP_GROUP_GENERIC(L2_DROPS, 0),
+       DEVLINK_TRAP_GROUP_GENERIC(L3_DROPS, 1),
+       DEVLINK_TRAP_GROUP_GENERIC(BUFFER_DROPS, 2),
+       DEVLINK_TRAP_GROUP_GENERIC(ACL_DROPS, 3),
 };
 
 static const struct devlink_trap nsim_traps_arr[] = {

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 9cd08fcfaff77583cbd88de90d6158c1573d1e4a..63834686c8d352c4300233250f355795de734b1a 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -574,6 +574,7 @@ struct devlink_trap_policer {
  * @name: Trap group name.
  * @id: Trap group identifier.
  * @generic: Whether the trap group is generic or not.
+ * @init_policer_id: Initial policer identifier.
  *
  * Describes immutable attributes of packet trap groups that drivers register
  * with devlink.
@@ -582,6 +583,7 @@ struct devlink_trap_group {
        const char *name;
        u16 id;
        bool generic;
+       u32 init_policer_id;
 };
 
 #define DEVLINK_TRAP_METADATA_TYPE_F_IN_PORT   BIT(0)
@@ -759,11 +761,12 @@ enum devlink_trap_group_generic_id {
                .metadata_cap = _metadata_cap,                                \
        }
 
-#define DEVLINK_TRAP_GROUP_GENERIC(_id)                                              \
+#define DEVLINK_TRAP_GROUP_GENERIC(_id, _policer_id)                         \
        {                                                                     \
                .name = DEVLINK_TRAP_GROUP_GENERIC_NAME_##_id,                \
                .id = DEVLINK_TRAP_GROUP_GENERIC_ID_##_id,                    \
                .generic = true,                                              \
+               .init_policer_id = _policer_id,                               \
        }
 
 #define DEVLINK_TRAP_POLICER(_id, _rate, _burst, _max_rate, _min_rate,       \

diff --git a/net/core/devlink.c b/net/core/devlink.c
index e22b8ed67bf79e7ec35c2f88a6f7f3bc7d6bd27b..544543443e9627e7037a8f0296d6809e7d03d8bf 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -5739,6 +5739,7 @@ struct devlink_trap_policer_item {
 /**
  * struct devlink_trap_group_item - Packet trap group attributes.
  * @group: Immutable packet trap group attributes.
+ * @policer_item: Associated policer item. Can be NULL.
  * @list: trap_group_list member.
  * @stats: Trap group statistics.
  *
@@ -5747,6 +5748,7 @@ struct devlink_trap_policer_item {
  */
 struct devlink_trap_group_item {
        const struct devlink_trap_group *group;
+       struct devlink_trap_policer_item *policer_item;
        struct list_head list;
        struct devlink_stats __percpu *stats;
 };
@@ -6161,6 +6163,11 @@ devlink_nl_trap_group_fill(struct sk_buff *msg, struct devlink *devlink,
            nla_put_flag(msg, DEVLINK_ATTR_TRAP_GENERIC))
                goto nla_put_failure;
 
+       if (group_item->policer_item &&
+           nla_put_u32(msg, DEVLINK_ATTR_TRAP_POLICER_ID,
+                       group_item->policer_item->policer->id))
+               goto nla_put_failure;
+
        err = devlink_trap_stats_put(msg, group_item->stats);
        if (err)
                goto nla_put_failure;
@@ -8759,6 +8766,25 @@ void *devlink_trap_ctx_priv(void *trap_ctx)
 }
 EXPORT_SYMBOL_GPL(devlink_trap_ctx_priv);
 
+static int
+devlink_trap_group_item_policer_link(struct devlink *devlink,
+                                    struct devlink_trap_group_item *group_item)
+{
+       u32 policer_id = group_item->group->init_policer_id;
+       struct devlink_trap_policer_item *policer_item;
+
+       if (policer_id == 0)
+               return 0;
+
+       policer_item = devlink_trap_policer_item_lookup(devlink, policer_id);
+       if (WARN_ON_ONCE(!policer_item))
+               return -EINVAL;
+
+       group_item->policer_item = policer_item;
+
+       return 0;
+}
+
 static int
 devlink_trap_group_register(struct devlink *devlink,
                            const struct devlink_trap_group *group)
@@ -8781,6 +8807,10 @@ devlink_trap_group_register(struct devlink *devlink,
 
        group_item->group = group;
 
+       err = devlink_trap_group_item_policer_link(devlink, group_item);
+       if (err)
+               goto err_policer_link;
+
        if (devlink->ops->trap_group_init) {
                err = devlink->ops->trap_group_init(devlink, group);
                if (err)
@@ -8794,6 +8824,7 @@ devlink_trap_group_register(struct devlink *devlink,
        return 0;
 
 err_group_init:
+err_policer_link:
        free_percpu(group_item->stats);
 err_stats_alloc:
        kfree(group_item);