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

Merge branch 'mlxsw-Add-support-for-buffer-drop-traps' 



Ido Schimmel says:

====================
mlxsw: Add support for buffer drop traps

Petr says:

A recent patch set added the ability to mirror buffer related drops
(e.g., early drops) through a netdev. This patch set adds the ability to
trap such packets to the local CPU for analysis.

The trapping towards the CPU is configured by using tc-trap action
instead of tc-mirred as was done when the packets were mirrored through
a netdev. A future patch set will also add the ability to sample the
dropped packets using tc-sample action.

The buffer related drop traps are added to devlink, which means that the
dropped packets can be reported to user space via the kernel's
drop_monitor module.

Patch set overview:

Patch #1 adds the early_drop trap to devlink

Patch #2 adds extack to a few devlink operations to facilitate better
error reporting to user space. This is necessary - among other things -
because the action of buffer drop traps cannot be changed in mlxsw

Patch #3 performs a small refactoring in mlxsw, patch #4 fixes a bug that
this patchset would trigger.

Patches #5-#6 add the infrastructure required to support different traps
/ trap groups in mlxsw per-ASIC. This is required because buffer drop
traps are not supported by Spectrum-1

Patch #7 extends mlxsw to register the early_drop trap

Patch #8 adds the offload logic for the "trap" action at a qevent block.

Patch #9 adds a mlxsw-specific selftest.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 80fbbb16 8fb6ac45

Documentation/networking/devlink/devlink-trap.rst

+4 −0
Original line number Diff line number Diff line
@@ -405,6 +405,10 @@ be added to the following table: 
     - ``control``

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

       tc's trap action)

   * - ``early_drop``

     - ``drop``

     - Traps packets dropped due to the RED (Random Early Detection) algorithm

       (i.e., early drops)



Driver-specific Packet Traps

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

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

+6 −4
Original line number Diff line number Diff line
@@ -1177,14 +1177,15 @@ static void mlxsw_devlink_trap_fini(struct devlink *devlink, 


static int mlxsw_devlink_trap_action_set(struct devlink *devlink,

					 const struct devlink_trap *trap,

					 enum devlink_trap_action action)

					 enum devlink_trap_action action,

					 struct netlink_ext_ack *extack)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	struct mlxsw_driver *mlxsw_driver = mlxsw_core->driver;



	if (!mlxsw_driver->trap_action_set)

		return -EOPNOTSUPP;

	return mlxsw_driver->trap_action_set(mlxsw_core, trap, action);

	return mlxsw_driver->trap_action_set(mlxsw_core, trap, action, extack);

}



static int
@@ -1202,14 +1203,15 @@ mlxsw_devlink_trap_group_init(struct devlink *devlink, 
static int

mlxsw_devlink_trap_group_set(struct devlink *devlink,

			     const struct devlink_trap_group *group,

			     const struct devlink_trap_policer *policer)

			     const struct devlink_trap_policer *policer,

			     struct netlink_ext_ack *extack)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	struct mlxsw_driver *mlxsw_driver = mlxsw_core->driver;



	if (!mlxsw_driver->trap_group_set)

		return -EOPNOTSUPP;

	return mlxsw_driver->trap_group_set(mlxsw_core, group, policer);

	return mlxsw_driver->trap_group_set(mlxsw_core, group, policer, extack);

}



static int

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

+14 −5
Original line number Diff line number Diff line
@@ -89,13 +89,15 @@ struct mlxsw_listener { 
};



#define __MLXSW_RXL(_func, _trap_id, _en_action, _is_ctrl, _en_trap_group,	\

		    _dis_action, _enabled_on_register, _dis_trap_group)		\

		    _dis_action, _enabled_on_register, _dis_trap_group,		\

		    _mirror_reason)						\

	{									\

		.trap_id = MLXSW_TRAP_ID_##_trap_id,				\

		.rx_listener =							\

		{								\

			.func = _func,						\

			.local_port = MLXSW_PORT_DONT_CARE,			\

			.mirror_reason = _mirror_reason,			\

			.trap_id = MLXSW_TRAP_ID_##_trap_id,			\

		},								\

		.en_action = MLXSW_REG_HPKT_ACTION_##_en_action,		\
@@ -109,12 +111,17 @@ struct mlxsw_listener { 
#define MLXSW_RXL(_func, _trap_id, _en_action, _is_ctrl, _trap_group,		\

		  _dis_action)							\

	__MLXSW_RXL(_func, _trap_id, _en_action, _is_ctrl, _trap_group,		\

		    _dis_action, true, _trap_group)

		    _dis_action, true, _trap_group, 0)



#define MLXSW_RXL_DIS(_func, _trap_id, _en_action, _is_ctrl, _en_trap_group,	\

		      _dis_action, _dis_trap_group)				\

	__MLXSW_RXL(_func, _trap_id, _en_action, _is_ctrl, _en_trap_group,	\

		    _dis_action, false, _dis_trap_group)

		    _dis_action, false, _dis_trap_group, 0)



#define MLXSW_RXL_MIRROR(_func, _session_id, _trap_group, _mirror_reason)	\

	__MLXSW_RXL(_func, MIRROR_SESSION##_session_id,	TRAP_TO_CPU, false,	\

		    _trap_group, TRAP_TO_CPU, true, _trap_group,		\

		    _mirror_reason)



#define MLXSW_EVENTL(_func, _trap_id, _trap_group)				\

	{									\
@@ -326,12 +333,14 @@ struct mlxsw_driver { 
			  const struct devlink_trap *trap, void *trap_ctx);

	int (*trap_action_set)(struct mlxsw_core *mlxsw_core,

			       const struct devlink_trap *trap,

			       enum devlink_trap_action action);

			       enum devlink_trap_action action,

			       struct netlink_ext_ack *extack);

	int (*trap_group_init)(struct mlxsw_core *mlxsw_core,

			       const struct devlink_trap_group *group);

	int (*trap_group_set)(struct mlxsw_core *mlxsw_core,

			      const struct devlink_trap_group *group,

			      const struct devlink_trap_policer *policer);

			      const struct devlink_trap_policer *policer,

			      struct netlink_ext_ack *extack);

	int (*trap_policer_init)(struct mlxsw_core *mlxsw_core,

				 const struct devlink_trap_policer *policer);

	void (*trap_policer_fini)(struct mlxsw_core *mlxsw_core,

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

+1 −0
Original line number Diff line number Diff line
@@ -5614,6 +5614,7 @@ enum mlxsw_reg_htgt_trap_group { 
	MLXSW_REG_HTGT_TRAP_GROUP_SP_L3_EXCEPTIONS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_TUNNEL_DISCARDS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_ACL_DISCARDS,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_BUFFER_DISCARDS,



	__MLXSW_REG_HTGT_TRAP_GROUP_MAX,

	MLXSW_REG_HTGT_TRAP_GROUP_MAX = __MLXSW_REG_HTGT_TRAP_GROUP_MAX - 1

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

+3 −0
Original line number Diff line number Diff line
@@ -3055,6 +3055,7 @@ static int mlxsw_sp1_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->ptp_ops = &mlxsw_sp1_ptp_ops;

	mlxsw_sp->span_ops = &mlxsw_sp1_span_ops;

	mlxsw_sp->policer_core_ops = &mlxsw_sp1_policer_core_ops;

	mlxsw_sp->trap_ops = &mlxsw_sp1_trap_ops;

	mlxsw_sp->listeners = mlxsw_sp1_listener;

	mlxsw_sp->listeners_count = ARRAY_SIZE(mlxsw_sp1_listener);

	mlxsw_sp->lowest_shaper_bs = MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP1;
@@ -3084,6 +3085,7 @@ static int mlxsw_sp2_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->ptp_ops = &mlxsw_sp2_ptp_ops;

	mlxsw_sp->span_ops = &mlxsw_sp2_span_ops;

	mlxsw_sp->policer_core_ops = &mlxsw_sp2_policer_core_ops;

	mlxsw_sp->trap_ops = &mlxsw_sp2_trap_ops;

	mlxsw_sp->lowest_shaper_bs = MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP2;



	return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info, extack);
@@ -3111,6 +3113,7 @@ static int mlxsw_sp3_init(struct mlxsw_core *mlxsw_core, 
	mlxsw_sp->ptp_ops = &mlxsw_sp2_ptp_ops;

	mlxsw_sp->span_ops = &mlxsw_sp3_span_ops;

	mlxsw_sp->policer_core_ops = &mlxsw_sp2_policer_core_ops;

	mlxsw_sp->trap_ops = &mlxsw_sp2_trap_ops;

	mlxsw_sp->lowest_shaper_bs = MLXSW_REG_QEEC_LOWEST_SHAPER_BS_SP3;



	return mlxsw_sp_init(mlxsw_core, mlxsw_bus_info, extack);