devlink: Create dedicated trap group for layer 3 exceptions

Packets that hit exceptions during layer 3 forwarding must be trapped to
the CPU for the control plane to function properly. Create a dedicated
group for them, so that user space could choose to assign a different
policer for them.

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/Documentation/networking/devlink/devlink-trap.rst b/Documentation/networking/devlink/devlink-trap.rst
index fe089acb7783ea5b2079dceac16da6c7c5dc4cf3..4ca241e70064977e970cb1fcf5cc0385da53aa5e 100644 (file)
--- a/Documentation/networking/devlink/devlink-trap.rst
+++ b/Documentation/networking/devlink/devlink-trap.rst
@@ -277,8 +277,11 @@ narrow. The description of these groups must be added to the following table:
      - Contains packet traps for packets that were dropped by the device during
        layer 2 forwarding (i.e., bridge)
    * - ``l3_drops``
-     - Contains packet traps for packets that were dropped by the device or hit
-       an exception (e.g., TTL error) during layer 3 forwarding
+     - Contains packet traps for packets that were dropped by the device during
+       layer 3 forwarding
+   * - ``l3_exceptions``
+     - Contains packet traps for packets that hit an exception (e.g., TTL
+       error) during layer 3 forwarding
    * - ``buffer_drops``
      - Contains packet traps for packets that were dropped by the device due to
        an enqueue decision

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 8ffc1b5cd89b7b83c98093971ac8c888eb5753f1..851388c9d7954d8d992fb2493a10de2fb9ed37a1 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -657,6 +657,7 @@ enum devlink_trap_generic_id {
 enum devlink_trap_group_generic_id {
        DEVLINK_TRAP_GROUP_GENERIC_ID_L2_DROPS,
        DEVLINK_TRAP_GROUP_GENERIC_ID_L3_DROPS,
+       DEVLINK_TRAP_GROUP_GENERIC_ID_L3_EXCEPTIONS,
        DEVLINK_TRAP_GROUP_GENERIC_ID_BUFFER_DROPS,
        DEVLINK_TRAP_GROUP_GENERIC_ID_TUNNEL_DROPS,
        DEVLINK_TRAP_GROUP_GENERIC_ID_ACL_DROPS,
@@ -730,6 +731,8 @@ enum devlink_trap_group_generic_id {
        "l2_drops"
 #define DEVLINK_TRAP_GROUP_GENERIC_NAME_L3_DROPS \
        "l3_drops"
+#define DEVLINK_TRAP_GROUP_GENERIC_NAME_L3_EXCEPTIONS \
+       "l3_exceptions"
 #define DEVLINK_TRAP_GROUP_GENERIC_NAME_BUFFER_DROPS \
        "buffer_drops"
 #define DEVLINK_TRAP_GROUP_GENERIC_NAME_TUNNEL_DROPS \

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 7b76e5fffc108eda0c7d531e69ed449910f1a498..d9fff7083f0238c3099a6811410d48a88863645f 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -8505,6 +8505,7 @@ static const struct devlink_trap devlink_trap_generic[] = {
 static const struct devlink_trap_group devlink_trap_group_generic[] = {
        DEVLINK_TRAP_GROUP(L2_DROPS),
        DEVLINK_TRAP_GROUP(L3_DROPS),
+       DEVLINK_TRAP_GROUP(L3_EXCEPTIONS),
        DEVLINK_TRAP_GROUP(BUFFER_DROPS),
        DEVLINK_TRAP_GROUP(TUNNEL_DROPS),
        DEVLINK_TRAP_GROUP(ACL_DROPS),