devlink: Add generic packet traps and groups

Add generic packet traps and groups that can report dropped packets as
well as exceptions such as TTL error.

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

diff --git a/include/net/devlink.h b/include/net/devlink.h
index 03b32e33e93e60a8cfc4d71fca19417e4104e509..fb02e0e89f9ddb38bf43690e868ab09ae11eff8e 100644 (file)
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -541,18 +541,58 @@ struct devlink_trap {
 };
 
 enum devlink_trap_generic_id {
+       DEVLINK_TRAP_GENERIC_ID_SMAC_MC,
+       DEVLINK_TRAP_GENERIC_ID_VLAN_TAG_MISMATCH,
+       DEVLINK_TRAP_GENERIC_ID_INGRESS_VLAN_FILTER,
+       DEVLINK_TRAP_GENERIC_ID_INGRESS_STP_FILTER,
+       DEVLINK_TRAP_GENERIC_ID_EMPTY_TX_LIST,
+       DEVLINK_TRAP_GENERIC_ID_PORT_LOOPBACK_FILTER,
+       DEVLINK_TRAP_GENERIC_ID_BLACKHOLE_ROUTE,
+       DEVLINK_TRAP_GENERIC_ID_TTL_ERROR,
+       DEVLINK_TRAP_GENERIC_ID_TAIL_DROP,
+
        /* Add new generic trap IDs above */
        __DEVLINK_TRAP_GENERIC_ID_MAX,
        DEVLINK_TRAP_GENERIC_ID_MAX = __DEVLINK_TRAP_GENERIC_ID_MAX - 1,
 };
 
 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_BUFFER_DROPS,
+
        /* Add new generic trap group IDs above */
        __DEVLINK_TRAP_GROUP_GENERIC_ID_MAX,
        DEVLINK_TRAP_GROUP_GENERIC_ID_MAX =
                __DEVLINK_TRAP_GROUP_GENERIC_ID_MAX - 1,
 };
 
+#define DEVLINK_TRAP_GENERIC_NAME_SMAC_MC \
+       "source_mac_is_multicast"
+#define DEVLINK_TRAP_GENERIC_NAME_VLAN_TAG_MISMATCH \
+       "vlan_tag_mismatch"
+#define DEVLINK_TRAP_GENERIC_NAME_INGRESS_VLAN_FILTER \
+       "ingress_vlan_filter"
+#define DEVLINK_TRAP_GENERIC_NAME_INGRESS_STP_FILTER \
+       "ingress_spanning_tree_filter"
+#define DEVLINK_TRAP_GENERIC_NAME_EMPTY_TX_LIST \
+       "port_list_is_empty"
+#define DEVLINK_TRAP_GENERIC_NAME_PORT_LOOPBACK_FILTER \
+       "port_loopback_filter"
+#define DEVLINK_TRAP_GENERIC_NAME_BLACKHOLE_ROUTE \
+       "blackhole_route"
+#define DEVLINK_TRAP_GENERIC_NAME_TTL_ERROR \
+       "ttl_value_is_too_small"
+#define DEVLINK_TRAP_GENERIC_NAME_TAIL_DROP \
+       "tail_drop"
+
+#define DEVLINK_TRAP_GROUP_GENERIC_NAME_L2_DROPS \
+       "l2_drops"
+#define DEVLINK_TRAP_GROUP_GENERIC_NAME_L3_DROPS \
+       "l3_drops"
+#define DEVLINK_TRAP_GROUP_GENERIC_NAME_BUFFER_DROPS \
+       "buffer_drops"
+
 #define DEVLINK_TRAP_GENERIC(_type, _init_action, _id, _group, _metadata_cap) \
        {                                                                     \
                .type = DEVLINK_TRAP_TYPE_##_type,                            \

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 960ceaec98d638d1ec58b56bfa158a4ceb1954a7..650f36379203b6be57068160659b6a660a80f6e3 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -7443,6 +7443,15 @@ EXPORT_SYMBOL_GPL(devlink_region_snapshot_create);
        }
 
 static const struct devlink_trap devlink_trap_generic[] = {
+       DEVLINK_TRAP(SMAC_MC, DROP),
+       DEVLINK_TRAP(VLAN_TAG_MISMATCH, DROP),
+       DEVLINK_TRAP(INGRESS_VLAN_FILTER, DROP),
+       DEVLINK_TRAP(INGRESS_STP_FILTER, DROP),
+       DEVLINK_TRAP(EMPTY_TX_LIST, DROP),
+       DEVLINK_TRAP(PORT_LOOPBACK_FILTER, DROP),
+       DEVLINK_TRAP(BLACKHOLE_ROUTE, DROP),
+       DEVLINK_TRAP(TTL_ERROR, EXCEPTION),
+       DEVLINK_TRAP(TAIL_DROP, DROP),
 };
 
 #define DEVLINK_TRAP_GROUP(_id)                                                      \
@@ -7452,6 +7461,9 @@ 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(BUFFER_DROPS),
 };
 
 static int devlink_trap_generic_verify(const struct devlink_trap *trap)