Commit ff0f6383 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'devlink-Add-support-for-control-packet-traps' 



Ido Schimmel says:

====================
devlink: Add support for control packet traps

So far device drivers were only able to register drop and exception
packet traps with devlink. These traps are used for packets that were
either dropped by the underlying device or encountered an exception
(e.g., missing neighbour entry) during forwarding.

However, in the steady state, the majority of the packets being trapped
to the CPU are packets that are required for the correct functioning of
the control plane. For example, ARP request and IGMP query packets.

This patch set allows device drivers to register such control traps with
devlink and expose their default control plane policy to user space.
User space can then tune the packet trap policer settings according to
its needs, as with existing packet traps.

In a similar fashion to exception traps, the action associated with such
traps cannot be changed as it can easily break the control plane. Unlike
drop and exception traps, packets trapped via control traps are not
reported to the kernel's drop monitor as they are not indicative of any
problem.

Patch set overview:

Patches #1-#3 break out layer 3 exceptions to a different group to
provide better granularity. A future patch set will make this completely
configurable.

Patch #4 adds a new trap action ('mirror') that is used for packets that
are forwarded by the device and sent to the CPU. Such packets are marked
by device drivers with 'skb->offload_fwd_mark = 1' in order to prevent
the kernel from forwarding them again.

Patch #5 adds the new trap type, 'control'.

Patches #6-#8 gradually add various control traps to devlink with proper
documentation.

Patch #9 adds a few control traps to netdevsim, which are automatically
exercised by existing devlink-trap selftest.

Patches #10 performs small refactoring in mlxsw.

Patches #11-#13 change mlxsw to register its existing control traps with
devlink.

Patch #14 adds a selftest over mlxsw that exercises all the registered
control traps.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents af0a2482 9959b389

Documentation/networking/devlink/devlink-trap.rst

+216 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ The following diagram provides a general overview of ``devlink-trap``:: 
                          |                |

                          +-------^--------+

                                  |

                                  |

                                  | Non-control traps

                                  |

                             +----+----+

                             |         |      Kernel's Rx path
@@ -97,6 +97,12 @@ The ``devlink-trap`` mechanism supports the following packet trap types: 
    processed by ``devlink`` and injected to the kernel's Rx path. Changing the

    action of such traps is not allowed, as it can easily break the control

    plane.

  * ``control``: Trapped packets were trapped by the device because these are

    control packets required for the correct functioning of the control plane.

    For example, ARP request and IGMP query packets. Packets are injected to

    the kernel's Rx path, but not reported to the kernel's drop monitor.

    Changing the action of such traps is not allowed, as it can easily break

    the control plane.



.. _Trap-Actions:
@@ -108,6 +114,8 @@ The ``devlink-trap`` mechanism supports the following packet trap actions: 
  * ``trap``: The sole copy of the packet is sent to the CPU.

  * ``drop``: The packet is dropped by the underlying device and a copy is not

    sent to the CPU.

  * ``mirror``: The packet is forwarded by the underlying device and a copy is

    sent to the CPU.



Generic Packet Traps

====================
@@ -244,6 +252,159 @@ be added to the following table: 
   * - ``egress_flow_action_drop``

     - ``drop``

     - Traps packets dropped during processing of egress flow action drop

   * - ``stp``

     - ``control``

     - Traps STP packets

   * - ``lacp``

     - ``control``

     - Traps LACP packets

   * - ``lldp``

     - ``control``

     - Traps LLDP packets

   * - ``igmp_query``

     - ``control``

     - Traps IGMP Membership Query packets

   * - ``igmp_v1_report``

     - ``control``

     - Traps IGMP Version 1 Membership Report packets

   * - ``igmp_v2_report``

     - ``control``

     - Traps IGMP Version 2 Membership Report packets

   * - ``igmp_v3_report``

     - ``control``

     - Traps IGMP Version 3 Membership Report packets

   * - ``igmp_v2_leave``

     - ``control``

     - Traps IGMP Version 2 Leave Group packets

   * - ``mld_query``

     - ``control``

     - Traps MLD Multicast Listener Query packets

   * - ``mld_v1_report``

     - ``control``

     - Traps MLD Version 1 Multicast Listener Report packets

   * - ``mld_v2_report``

     - ``control``

     - Traps MLD Version 2 Multicast Listener Report packets

   * - ``mld_v1_done``

     - ``control``

     - Traps MLD Version 1 Multicast Listener Done packets

   * - ``ipv4_dhcp``

     - ``control``

     - Traps IPv4 DHCP packets

   * - ``ipv6_dhcp``

     - ``control``

     - Traps IPv6 DHCP packets

   * - ``arp_request``

     - ``control``

     - Traps ARP request packets

   * - ``arp_response``

     - ``control``

     - Traps ARP response packets

   * - ``arp_overlay``

     - ``control``

     - Traps NVE-decapsulated ARP packets that reached the overlay network.

       This is required, for example, when the address that needs to be

       resolved is a local address

   * - ``ipv6_neigh_solicit``

     - ``control``

     - Traps IPv6 Neighbour Solicitation packets

   * - ``ipv6_neigh_advert``

     - ``control``

     - Traps IPv6 Neighbour Advertisement packets

   * - ``ipv4_bfd``

     - ``control``

     - Traps IPv4 BFD packets

   * - ``ipv6_bfd``

     - ``control``

     - Traps IPv6 BFD packets

   * - ``ipv4_ospf``

     - ``control``

     - Traps IPv4 OSPF packets

   * - ``ipv6_ospf``

     - ``control``

     - Traps IPv6 OSPF packets

   * - ``ipv4_bgp``

     - ``control``

     - Traps IPv4 BGP packets

   * - ``ipv6_bgp``

     - ``control``

     - Traps IPv6 BGP packets

   * - ``ipv4_vrrp``

     - ``control``

     - Traps IPv4 VRRP packets

   * - ``ipv6_vrrp``

     - ``control``

     - Traps IPv6 VRRP packets

   * - ``ipv4_pim``

     - ``control``

     - Traps IPv4 PIM packets

   * - ``ipv6_pim``

     - ``control``

     - Traps IPv6 PIM packets

   * - ``uc_loopback``

     - ``control``

     - Traps unicast packets that need to be routed through the same layer 3

       interface from which they were received. Such packets are routed by the

       kernel, but also cause it to potentially generate ICMP redirect packets

   * - ``local_route``

     - ``control``

     - Traps unicast packets that hit a local route and need to be locally

       delivered

   * - ``external_route``

     - ``control``

     - Traps packets that should be routed through an external interface (e.g.,

       management interface) that does not belong to the same device (e.g.,

       switch ASIC) as the ingress interface

   * - ``ipv6_uc_dip_link_local_scope``

     - ``control``

     - Traps unicast IPv6 packets that need to be routed and have a destination

       IP address with a link-local scope (i.e., fe80::/10). The trap allows

       device drivers to avoid programming link-local routes, but still receive

       packets for local delivery

   * - ``ipv6_dip_all_nodes``

     - ``control``

     - Traps IPv6 packets that their destination IP address is the "All Nodes

       Address" (i.e., ff02::1)

   * - ``ipv6_dip_all_routers``

     - ``control``

     - Traps IPv6 packets that their destination IP address is the "All Routers

       Address" (i.e., ff02::2)

   * - ``ipv6_router_solicit``

     - ``control``

     - Traps IPv6 Router Solicitation packets

   * - ``ipv6_router_advert``

     - ``control``

     - Traps IPv6 Router Advertisement packets

   * - ``ipv6_redirect``

     - ``control``

     - Traps IPv6 Redirect Message packets

   * - ``ipv4_router_alert``

     - ``control``

     - Traps IPv4 packets that need to be routed and include the Router Alert

       option. Such packets need to be locally delivered to raw sockets that

       have the IP_ROUTER_ALERT socket option set

   * - ``ipv6_router_alert``

     - ``control``

     - Traps IPv6 packets that need to be routed and include the Router Alert

       option in their Hop-by-Hop extension header. Such packets need to be

       locally delivered to raw sockets that have the IPV6_ROUTER_ALERT socket

       option set

   * - ``ptp_event``

     - ``control``

     - Traps PTP time-critical event messages (Sync, Delay_req, Pdelay_Req and

       Pdelay_Resp)

   * - ``ptp_general``

     - ``control``

     - Traps PTP general messages (Announce, Follow_Up, Delay_Resp,

       Pdelay_Resp_Follow_Up, management and signaling)

   * - ``flow_action_sample``

     - ``control``

     - Traps packets sampled during processing of flow action sample (e.g., via

       tc's sample action)

   * - ``flow_action_trap``

     - ``control``

     - Traps packets logged during processing of flow action trap (e.g., via

       tc's trap action)



Driver-specific Packet Traps

============================
@@ -277,8 +438,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
@@ -288,6 +452,55 @@ narrow. The description of these groups must be added to the following table: 
   * - ``acl_drops``

     - Contains packet traps for packets that were dropped by the device during

       ACL processing

   * - ``stp``

     - Contains packet traps for STP packets

   * - ``lacp``

     - Contains packet traps for LACP packets

   * - ``lldp``

     - Contains packet traps for LLDP packets

   * - ``mc_snooping``

     - Contains packet traps for IGMP and MLD packets required for multicast

       snooping

   * - ``dhcp``

     - Contains packet traps for DHCP packets

   * - ``neigh_discovery``

     - Contains packet traps for neighbour discovery packets (e.g., ARP, IPv6

       ND)

   * - ``bfd``

     - Contains packet traps for BFD packets

   * - ``ospf``

     - Contains packet traps for OSPF packets

   * - ``bgp``

     - Contains packet traps for BGP packets

   * - ``vrrp``

     - Contains packet traps for VRRP packets

   * - ``pim``

     - Contains packet traps for PIM packets

   * - ``uc_loopback``

     - Contains a packet trap for unicast loopback packets (i.e.,

       ``uc_loopback``). This trap is singled-out because in cases such as

       one-armed router it will be constantly triggered. To limit the impact on

       the CPU usage, a packet trap policer with a low rate can be bound to the

       group without affecting other traps

   * - ``local_delivery``

     - Contains packet traps for packets that should be locally delivered after

       routing, but do not match more specific packet traps (e.g.,

       ``ipv4_bgp``)

   * - ``ipv6``

     - Contains packet traps for various IPv6 control packets (e.g., Router

       Advertisements)

   * - ``ptp_event``

     - Contains packet traps for PTP time-critical event messages (Sync,

       Delay_req, Pdelay_Req and Pdelay_Resp)

   * - ``ptp_general``

     - Contains packet traps for PTP general messages (Announce, Follow_Up,

       Delay_Resp, Pdelay_Resp_Follow_Up, management and signaling)

   * - ``acl_sample``

     - Contains packet traps for packets that were sampled by the device during

       ACL processing

   * - ``acl_trap``

     - Contains packet traps for packets that were trapped (logged) by the

       device during ACL processing



Packet Trap Policers

====================

drivers/net/ethernet/mellanox/mlxsw/reg.h

+1 −1
Original line number Diff line number Diff line
@@ -5536,7 +5536,6 @@ enum mlxsw_reg_htgt_trap_group { 
	MLXSW_REG_HTGT_TRAP_GROUP_SP_MULTICAST,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_NEIGH_DISCOVERY,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_EVENT,
@@ -5552,6 +5551,7 @@ enum mlxsw_reg_htgt_trap_group { 
	MLXSW_REG_HTGT_TRAP_GROUP_SP_DUMMY,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_L2_DISCARDS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_L3_DISCARDS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_L3_EXCEPTIONS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_TUNNEL_DISCARDS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_ACL_DISCARDS,

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+8 −141
Original line number Diff line number Diff line
@@ -3987,10 +3987,15 @@ static void mlxsw_sp_rx_listener_l3_mark_func(struct sk_buff *skb, 
	return mlxsw_sp_rx_listener_no_mark_func(skb, local_port, priv);

}



static void mlxsw_sp_rx_listener_sample_func(struct sk_buff *skb, u8 local_port,

					     void *priv)

void mlxsw_sp_ptp_receive(struct mlxsw_sp *mlxsw_sp, struct sk_buff *skb,

			  u8 local_port)

{

	mlxsw_sp->ptp_ops->receive(mlxsw_sp, skb, local_port);

}



void mlxsw_sp_sample_receive(struct mlxsw_sp *mlxsw_sp, struct sk_buff *skb,

			     u8 local_port)

{

	struct mlxsw_sp *mlxsw_sp = priv;

	struct mlxsw_sp_port *mlxsw_sp_port = mlxsw_sp->ports[local_port];

	struct mlxsw_sp_port_sample *sample;

	u32 size;
@@ -4014,14 +4019,6 @@ out: 
	consume_skb(skb);

}



static void mlxsw_sp_rx_listener_ptp(struct sk_buff *skb, u8 local_port,

				     void *priv)

{

	struct mlxsw_sp *mlxsw_sp = priv;



	mlxsw_sp->ptp_ops->receive(mlxsw_sp, skb, local_port);

}



#define MLXSW_SP_RXL_NO_MARK(_trap_id, _action, _trap_group, _is_ctrl)	\

	MLXSW_RXL(mlxsw_sp_rx_listener_no_mark_func, _trap_id, _action,	\

		  _is_ctrl, SP_##_trap_group, DISCARD)
@@ -4041,60 +4038,13 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = { 
	/* Events */

	MLXSW_SP_EVENTL(mlxsw_sp_pude_event_func, PUDE),

	/* L2 traps */

	MLXSW_SP_RXL_NO_MARK(STP, TRAP_TO_CPU, STP, true),

	MLXSW_SP_RXL_NO_MARK(LACP, TRAP_TO_CPU, LACP, true),

	MLXSW_RXL(mlxsw_sp_rx_listener_ptp, LLDP, TRAP_TO_CPU,

		  false, SP_LLDP, DISCARD),

	MLXSW_SP_RXL_MARK(IGMP_QUERY, MIRROR_TO_CPU, MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IGMP_V1_REPORT, TRAP_TO_CPU, MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IGMP_V2_REPORT, TRAP_TO_CPU, MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IGMP_V2_LEAVE, TRAP_TO_CPU, MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IGMP_V3_REPORT, TRAP_TO_CPU, MC_SNOOPING, false),

	MLXSW_SP_RXL_MARK(ARPBC, MIRROR_TO_CPU, NEIGH_DISCOVERY, false),

	MLXSW_SP_RXL_MARK(ARPUC, MIRROR_TO_CPU, NEIGH_DISCOVERY, false),

	MLXSW_SP_RXL_NO_MARK(FID_MISS, TRAP_TO_CPU, FID_MISS, false),

	MLXSW_SP_RXL_MARK(IPV6_MLDV12_LISTENER_QUERY, MIRROR_TO_CPU,

			  MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV1_LISTENER_REPORT, TRAP_TO_CPU,

			     MC_SNOOPING, false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV1_LISTENER_DONE, TRAP_TO_CPU, MC_SNOOPING,

			     false),

	MLXSW_SP_RXL_NO_MARK(IPV6_MLDV2_LISTENER_REPORT, TRAP_TO_CPU,

			     MC_SNOOPING, false),

	/* L3 traps */

	MLXSW_SP_RXL_L3_MARK(LBERROR, MIRROR_TO_CPU, LBERROR, false),

	MLXSW_SP_RXL_MARK(IP2ME, TRAP_TO_CPU, IP2ME, false),

	MLXSW_SP_RXL_MARK(IPV6_UNSPECIFIED_ADDRESS, TRAP_TO_CPU, ROUTER_EXP,

			  false),

	MLXSW_SP_RXL_MARK(IPV6_LINK_LOCAL_DEST, TRAP_TO_CPU, IP2ME, false),

	MLXSW_SP_RXL_MARK(IPV6_LINK_LOCAL_SRC, TRAP_TO_CPU, ROUTER_EXP, false),

	MLXSW_SP_RXL_MARK(IPV6_ALL_NODES_LINK, TRAP_TO_CPU, IPV6, false),

	MLXSW_SP_RXL_MARK(IPV6_ALL_ROUTERS_LINK, TRAP_TO_CPU, IPV6,

			  false),

	MLXSW_SP_RXL_MARK(IPV4_OSPF, TRAP_TO_CPU, OSPF, false),

	MLXSW_SP_RXL_MARK(IPV6_OSPF, TRAP_TO_CPU, OSPF, false),

	MLXSW_SP_RXL_MARK(IPV4_DHCP, TRAP_TO_CPU, DHCP, false),

	MLXSW_SP_RXL_MARK(IPV6_DHCP, TRAP_TO_CPU, DHCP, false),

	MLXSW_SP_RXL_MARK(RTR_INGRESS0, TRAP_TO_CPU, REMOTE_ROUTE, false),

	MLXSW_SP_RXL_MARK(IPV4_BGP, TRAP_TO_CPU, BGP, false),

	MLXSW_SP_RXL_MARK(IPV6_BGP, TRAP_TO_CPU, BGP, false),

	MLXSW_SP_RXL_MARK(L3_IPV6_ROUTER_SOLICITATION, TRAP_TO_CPU, IPV6,

			  false),

	MLXSW_SP_RXL_MARK(L3_IPV6_ROUTER_ADVERTISEMENT, TRAP_TO_CPU, IPV6,

			  false),

	MLXSW_SP_RXL_MARK(L3_IPV6_NEIGHBOR_SOLICITATION, TRAP_TO_CPU,

			  NEIGH_DISCOVERY, false),

	MLXSW_SP_RXL_MARK(L3_IPV6_NEIGHBOR_ADVERTISEMENT, TRAP_TO_CPU,

			  NEIGH_DISCOVERY, false),

	MLXSW_SP_RXL_MARK(L3_IPV6_REDIRECTION, TRAP_TO_CPU, IPV6, false),

	MLXSW_SP_RXL_MARK(IPV6_MC_LINK_LOCAL_DEST, TRAP_TO_CPU, ROUTER_EXP,

			  false),

	MLXSW_SP_RXL_MARK(ROUTER_ALERT_IPV4, TRAP_TO_CPU, IP2ME, false),

	MLXSW_SP_RXL_MARK(ROUTER_ALERT_IPV6, TRAP_TO_CPU, IP2ME, false),

	MLXSW_SP_RXL_MARK(IPV4_VRRP, TRAP_TO_CPU, VRRP, false),

	MLXSW_SP_RXL_MARK(IPV6_VRRP, TRAP_TO_CPU, VRRP, false),

	MLXSW_SP_RXL_MARK(IPV4_BFD, TRAP_TO_CPU, BFD, false),

	MLXSW_SP_RXL_MARK(IPV6_BFD, TRAP_TO_CPU, BFD, false),

	MLXSW_SP_RXL_NO_MARK(DISCARD_ING_ROUTER_SIP_CLASS_E, FORWARD,

			     ROUTER_EXP, false),

	MLXSW_SP_RXL_NO_MARK(DISCARD_ING_ROUTER_MC_DMAC, FORWARD,
@@ -4103,24 +4053,11 @@ static const struct mlxsw_listener mlxsw_sp_listener[] = { 
			     ROUTER_EXP, false),

	MLXSW_SP_RXL_NO_MARK(DISCARD_ING_ROUTER_DIP_LINK_LOCAL, FORWARD,

			     ROUTER_EXP, false),

	/* PKT Sample trap */

	MLXSW_RXL(mlxsw_sp_rx_listener_sample_func, PKT_SAMPLE, MIRROR_TO_CPU,

		  false, SP_PKT_SAMPLE, DISCARD),

	/* ACL trap */

	MLXSW_SP_RXL_NO_MARK(ACL0, TRAP_TO_CPU, FLOW_LOGGING, false),

	/* Multicast Router Traps */

	MLXSW_SP_RXL_MARK(IPV4_PIM, TRAP_TO_CPU, PIM, false),

	MLXSW_SP_RXL_MARK(IPV6_PIM, TRAP_TO_CPU, PIM, false),

	MLXSW_SP_RXL_MARK(ACL1, TRAP_TO_CPU, MULTICAST, false),

	MLXSW_SP_RXL_L3_MARK(ACL2, TRAP_TO_CPU, MULTICAST, false),

	/* NVE traps */

	MLXSW_SP_RXL_MARK(NVE_ENCAP_ARP, TRAP_TO_CPU, NEIGH_DISCOVERY, false),

	MLXSW_SP_RXL_NO_MARK(NVE_DECAP_ARP, TRAP_TO_CPU, NEIGH_DISCOVERY,

			     false),

	/* PTP traps */

	MLXSW_RXL(mlxsw_sp_rx_listener_ptp, PTP0, TRAP_TO_CPU,

		  false, SP_PTP0, DISCARD),

	MLXSW_SP_RXL_NO_MARK(PTP1, TRAP_TO_CPU, PTP1, false),

};



static const struct mlxsw_listener mlxsw_sp1_listener[] = {
@@ -4149,48 +4086,12 @@ static int mlxsw_sp_cpu_policers_set(struct mlxsw_core *mlxsw_core) 
	for (i = 0; i < max_cpu_policers; i++) {

		is_bytes = false;

		switch (i) {

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_STP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_LACP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_LLDP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_OSPF:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_PIM:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_LBERROR:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP:

			rate = 128;

			burst_size = 7;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_MC_SNOOPING:

			rate = 16 * 1024;

			burst_size = 10;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_NEIGH_DISCOVERY:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_MULTICAST:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_FLOW_LOGGING:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_FID_MISS:

			rate = 1024;

			burst_size = 7;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_PTP0:

			rate = 24 * 1024;

			burst_size = 12;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_PTP1:

			rate = 19 * 1024;

			burst_size = 12;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_VRRP:

			rate = 360;

			burst_size = 7;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BFD:

			rate = 20 * 1024;

			burst_size = 10;

			break;

		default:

			continue;

		}
@@ -4225,46 +4126,12 @@ static int mlxsw_sp_trap_groups_set(struct mlxsw_core *mlxsw_core) 
	for (i = 0; i < max_trap_groups; i++) {

		policer_id = i;

		switch (i) {

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_STP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_LACP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_LLDP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_OSPF:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_PIM:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_PTP0:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_VRRP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BFD:

			priority = 5;

			tc = 5;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_FLOW_LOGGING:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_BGP:

			priority = 4;

			tc = 4;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_MC_SNOOPING:

			priority = 3;

			tc = 3;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_NEIGH_DISCOVERY:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IP2ME:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_IPV6:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_PTP1:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_DHCP:

			priority = 2;

			tc = 2;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_ROUTER_EXP:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_REMOTE_ROUTE:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_MULTICAST:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_FID_MISS:

			priority = 1;

			tc = 1;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_PKT_SAMPLE:

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_LBERROR:

			priority = 0;

			tc = 0;

			break;

		case MLXSW_REG_HTGT_TRAP_GROUP_SP_EVENT:

			priority = MLXSW_REG_HTGT_DEFAULT_PRIORITY;

			tc = MLXSW_REG_HTGT_DEFAULT_TC;

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+4 −0
Original line number Diff line number Diff line
@@ -451,6 +451,10 @@ extern struct notifier_block mlxsw_sp_switchdev_notifier; 
/* spectrum.c */

void mlxsw_sp_rx_listener_no_mark_func(struct sk_buff *skb,

				       u8 local_port, void *priv);

void mlxsw_sp_ptp_receive(struct mlxsw_sp *mlxsw_sp, struct sk_buff *skb,

			  u8 local_port);

void mlxsw_sp_sample_receive(struct mlxsw_sp *mlxsw_sp, struct sk_buff *skb,

			     u8 local_port);

int mlxsw_sp_port_speed_get(struct mlxsw_sp_port *mlxsw_sp_port, u32 *speed);

int mlxsw_sp_port_ets_set(struct mlxsw_sp_port *mlxsw_sp_port,

			  enum mlxsw_reg_qeec_hr hr, u8 index, u8 next_index,

drivers/net/ethernet/mellanox/mlxsw/spectrum_trap.c

+562 −21

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE