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

Merge branch 'mlxsw-Add-devlink-trap-support' 



Ido Schimmel says:

====================
mlxsw: Add devlink-trap support

This patchset adds devlink-trap support in mlxsw.

Patches #1-#4 add the necessary APIs and defines in mlxsw.

Patch #5 implements devlink-trap support for layer 2 drops. More drops
will be added in the future.

Patches #6-#7 add selftests to make sure that all the new code paths are
exercised and that the feature is working as expected.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8c40f3b2 1455865a

drivers/net/ethernet/mellanox/mlxsw/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ mlxsw_spectrum-objs := spectrum.o spectrum_buffers.o \ 
				   spectrum_mr_tcam.o spectrum_mr.o \

				   spectrum_qdisc.o spectrum_span.o \

				   spectrum_nve.o spectrum_nve_vxlan.o \

				   spectrum_dpipe.o

				   spectrum_dpipe.o spectrum_trap.o

mlxsw_spectrum-$(CONFIG_MLXSW_SPECTRUM_DCB)	+= spectrum_dcb.o

mlxsw_spectrum-$(CONFIG_PTP_1588_CLOCK)		+= spectrum_ptp.o

obj-$(CONFIG_MLXSW_MINIMAL)	+= mlxsw_minimal.o

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

+64 −0
Original line number Diff line number Diff line
@@ -1017,6 +1017,54 @@ static int mlxsw_devlink_flash_update(struct devlink *devlink, 
					  component, extack);

}



static int mlxsw_devlink_trap_init(struct devlink *devlink,

				   const struct devlink_trap *trap,

				   void *trap_ctx)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	struct mlxsw_driver *mlxsw_driver = mlxsw_core->driver;



	if (!mlxsw_driver->trap_init)

		return -EOPNOTSUPP;

	return mlxsw_driver->trap_init(mlxsw_core, trap, trap_ctx);

}



static void mlxsw_devlink_trap_fini(struct devlink *devlink,

				    const struct devlink_trap *trap,

				    void *trap_ctx)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	struct mlxsw_driver *mlxsw_driver = mlxsw_core->driver;



	if (!mlxsw_driver->trap_fini)

		return;

	mlxsw_driver->trap_fini(mlxsw_core, trap, trap_ctx);

}



static int mlxsw_devlink_trap_action_set(struct devlink *devlink,

					 const struct devlink_trap *trap,

					 enum devlink_trap_action action)

{

	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);

}



static int

mlxsw_devlink_trap_group_init(struct devlink *devlink,

			      const struct devlink_trap_group *group)

{

	struct mlxsw_core *mlxsw_core = devlink_priv(devlink);

	struct mlxsw_driver *mlxsw_driver = mlxsw_core->driver;



	if (!mlxsw_driver->trap_group_init)

		return -EOPNOTSUPP;

	return mlxsw_driver->trap_group_init(mlxsw_core, group);

}



static const struct devlink_ops mlxsw_devlink_ops = {

	.reload				= mlxsw_devlink_core_bus_device_reload,

	.port_type_set			= mlxsw_devlink_port_type_set,
@@ -1034,6 +1082,10 @@ static const struct devlink_ops mlxsw_devlink_ops = { 
	.sb_occ_tc_port_bind_get	= mlxsw_devlink_sb_occ_tc_port_bind_get,

	.info_get			= mlxsw_devlink_info_get,

	.flash_update			= mlxsw_devlink_flash_update,

	.trap_init			= mlxsw_devlink_trap_init,

	.trap_fini			= mlxsw_devlink_trap_fini,

	.trap_action_set		= mlxsw_devlink_trap_action_set,

	.trap_group_init		= mlxsw_devlink_trap_group_init,

};



static int
@@ -1477,6 +1529,18 @@ void mlxsw_core_trap_unregister(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_trap_unregister);



int mlxsw_core_trap_action_set(struct mlxsw_core *mlxsw_core,

			       const struct mlxsw_listener *listener,

			       enum mlxsw_reg_hpkt_action action)

{

	char hpkt_pl[MLXSW_REG_HPKT_LEN];



	mlxsw_reg_hpkt_pack(hpkt_pl, action, listener->trap_id,

			    listener->trap_group, listener->is_ctrl);

	return mlxsw_reg_write(mlxsw_core, MLXSW_REG(hpkt), hpkt_pl);

}

EXPORT_SYMBOL(mlxsw_core_trap_action_set);



static u64 mlxsw_core_tid_get(struct mlxsw_core *mlxsw_core)

{

	return atomic64_inc_return(&mlxsw_core->emad.tid);

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

+12 −0
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ int mlxsw_core_trap_register(struct mlxsw_core *mlxsw_core, 
void mlxsw_core_trap_unregister(struct mlxsw_core *mlxsw_core,

				const struct mlxsw_listener *listener,

				void *priv);

int mlxsw_core_trap_action_set(struct mlxsw_core *mlxsw_core,

			       const struct mlxsw_listener *listener,

			       enum mlxsw_reg_hpkt_action action);



typedef void mlxsw_reg_trans_cb_t(struct mlxsw_core *mlxsw_core, char *payload,

				  size_t payload_len, unsigned long cb_priv);
@@ -289,6 +292,15 @@ struct mlxsw_driver { 
	int (*flash_update)(struct mlxsw_core *mlxsw_core,

			    const char *file_name, const char *component,

			    struct netlink_ext_ack *extack);

	int (*trap_init)(struct mlxsw_core *mlxsw_core,

			 const struct devlink_trap *trap, void *trap_ctx);

	void (*trap_fini)(struct mlxsw_core *mlxsw_core,

			  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);

	int (*trap_group_init)(struct mlxsw_core *mlxsw_core,

			       const struct devlink_trap_group *group);

	void (*txhdr_construct)(struct sk_buff *skb,

				const struct mlxsw_tx_info *tx_info);

	int (*resources_register)(struct mlxsw_core *mlxsw_core);

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

+12 −0
Original line number Diff line number Diff line
@@ -5422,6 +5422,14 @@ enum mlxsw_reg_htgt_trap_group { 
	MLXSW_REG_HTGT_TRAP_GROUP_SP_LBERROR,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_PTP0,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_PTP1,



	__MLXSW_REG_HTGT_TRAP_GROUP_MAX,

	MLXSW_REG_HTGT_TRAP_GROUP_MAX = __MLXSW_REG_HTGT_TRAP_GROUP_MAX - 1

};



enum mlxsw_reg_htgt_discard_trap_group {

	MLXSW_REG_HTGT_DISCARD_TRAP_GROUP_BASE = MLXSW_REG_HTGT_TRAP_GROUP_MAX,

	MLXSW_REG_HTGT_TRAP_GROUP_SP_L2_DISCARDS,

};



/* reg_htgt_trap_group
@@ -5559,6 +5567,8 @@ enum mlxsw_reg_hpkt_action { 
	MLXSW_REG_HPKT_ACTION_DISCARD,

	MLXSW_REG_HPKT_ACTION_SOFT_DISCARD,

	MLXSW_REG_HPKT_ACTION_TRAP_AND_SOFT_DISCARD,

	MLXSW_REG_HPKT_ACTION_TRAP_EXCEPTION_TO_CPU,

	MLXSW_REG_HPKT_ACTION_SET_FW_DEFAULT = 15,

};



/* reg_hpkt_action
@@ -5569,6 +5579,8 @@ enum mlxsw_reg_hpkt_action { 
 * 3 - Discard.

 * 4 - Soft discard (allow other traps to act on the packet).

 * 5 - Trap and soft discard (allow other traps to overwrite this trap).

 * 6 - Trap to CPU (CPU receives sole copy) and count it as error.

 * 15 - Restore the firmware's default action.

 * Access: RW

 *

 * Note: Must be set to 0 (forward) for event trap IDs, as they are already

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

+21 −0
Original line number Diff line number Diff line
@@ -4665,6 +4665,12 @@ static int mlxsw_sp_init(struct mlxsw_core *mlxsw_core, 
		goto err_traps_init;

	}



	err = mlxsw_sp_devlink_traps_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize devlink traps\n");

		goto err_devlink_traps_init;

	}



	err = mlxsw_sp_buffers_init(mlxsw_sp);

	if (err) {

		dev_err(mlxsw_sp->bus_info->dev, "Failed to initialize buffers\n");
@@ -4798,6 +4804,8 @@ err_span_init: 
err_lag_init:

	mlxsw_sp_buffers_fini(mlxsw_sp);

err_buffers_init:

	mlxsw_sp_devlink_traps_fini(mlxsw_sp);

err_devlink_traps_init:

	mlxsw_sp_traps_fini(mlxsw_sp);

err_traps_init:

	mlxsw_sp_fids_fini(mlxsw_sp);
@@ -4870,6 +4878,7 @@ static void mlxsw_sp_fini(struct mlxsw_core *mlxsw_core) 
	mlxsw_sp_span_fini(mlxsw_sp);

	mlxsw_sp_lag_fini(mlxsw_sp);

	mlxsw_sp_buffers_fini(mlxsw_sp);

	mlxsw_sp_devlink_traps_fini(mlxsw_sp);

	mlxsw_sp_traps_fini(mlxsw_sp);

	mlxsw_sp_fids_fini(mlxsw_sp);

	mlxsw_sp_kvdl_fini(mlxsw_sp);
@@ -5251,6 +5260,10 @@ static struct mlxsw_driver mlxsw_sp1_driver = { 
	.sb_occ_port_pool_get		= mlxsw_sp_sb_occ_port_pool_get,

	.sb_occ_tc_port_bind_get	= mlxsw_sp_sb_occ_tc_port_bind_get,

	.flash_update			= mlxsw_sp_flash_update,

	.trap_init			= mlxsw_sp_trap_init,

	.trap_fini			= mlxsw_sp_trap_fini,

	.trap_action_set		= mlxsw_sp_trap_action_set,

	.trap_group_init		= mlxsw_sp_trap_group_init,

	.txhdr_construct		= mlxsw_sp_txhdr_construct,

	.resources_register		= mlxsw_sp1_resources_register,

	.kvd_sizes_get			= mlxsw_sp_kvd_sizes_get,
@@ -5281,6 +5294,10 @@ static struct mlxsw_driver mlxsw_sp2_driver = { 
	.sb_occ_port_pool_get		= mlxsw_sp_sb_occ_port_pool_get,

	.sb_occ_tc_port_bind_get	= mlxsw_sp_sb_occ_tc_port_bind_get,

	.flash_update			= mlxsw_sp_flash_update,

	.trap_init			= mlxsw_sp_trap_init,

	.trap_fini			= mlxsw_sp_trap_fini,

	.trap_action_set		= mlxsw_sp_trap_action_set,

	.trap_group_init		= mlxsw_sp_trap_group_init,

	.txhdr_construct		= mlxsw_sp_txhdr_construct,

	.resources_register		= mlxsw_sp2_resources_register,

	.params_register		= mlxsw_sp2_params_register,
@@ -5310,6 +5327,10 @@ static struct mlxsw_driver mlxsw_sp3_driver = { 
	.sb_occ_port_pool_get		= mlxsw_sp_sb_occ_port_pool_get,

	.sb_occ_tc_port_bind_get	= mlxsw_sp_sb_occ_tc_port_bind_get,

	.flash_update			= mlxsw_sp_flash_update,

	.trap_init			= mlxsw_sp_trap_init,

	.trap_fini			= mlxsw_sp_trap_fini,

	.trap_action_set		= mlxsw_sp_trap_action_set,

	.trap_group_init		= mlxsw_sp_trap_group_init,

	.txhdr_construct		= mlxsw_sp_txhdr_construct,

	.resources_register		= mlxsw_sp2_resources_register,

	.params_register		= mlxsw_sp2_params_register,

CRA Git | Maintained and supported by SUSTech CRA and CCSE