Commit 7240db69 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

mlxsw: spectrum_acl: Convert flower-based mirroring to new SPAN API 



In flower-based mirroring, mirroring is done with ACLs and the SPAN
agent is not bound to a port. Instead its identifier is specified in an
ACL action.

Convert this type of mirroring to use the new API.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1d7845d

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

+19 −12
Original line number Diff line number Diff line
@@ -136,28 +136,35 @@ mlxsw_sp_act_mirror_add(void *priv, u8 local_in_port, 
			const struct net_device *out_dev,

			bool ingress, int *p_span_id)

{

	struct mlxsw_sp_port *in_port;

	struct mlxsw_sp_port *mlxsw_sp_port;

	struct mlxsw_sp *mlxsw_sp = priv;

	enum mlxsw_sp_span_type type;

	int err;



	type = ingress ? MLXSW_SP_SPAN_INGRESS : MLXSW_SP_SPAN_EGRESS;

	in_port = mlxsw_sp->ports[local_in_port];

	err = mlxsw_sp_span_agent_get(mlxsw_sp, out_dev, p_span_id);

	if (err)

		return err;



	mlxsw_sp_port = mlxsw_sp->ports[local_in_port];

	err = mlxsw_sp_span_analyzed_port_get(mlxsw_sp_port, ingress);

	if (err)

		goto err_analyzed_port_get;



	return mlxsw_sp_span_mirror_add(in_port, out_dev, type,

					false, p_span_id);

	return 0;



err_analyzed_port_get:

	mlxsw_sp_span_agent_put(mlxsw_sp, *p_span_id);

	return err;

}



static void

mlxsw_sp_act_mirror_del(void *priv, u8 local_in_port, int span_id, bool ingress)

{

	struct mlxsw_sp_port *mlxsw_sp_port;

	struct mlxsw_sp *mlxsw_sp = priv;

	struct mlxsw_sp_port *in_port;

	enum mlxsw_sp_span_type type;



	type = ingress ? MLXSW_SP_SPAN_INGRESS : MLXSW_SP_SPAN_EGRESS;

	in_port = mlxsw_sp->ports[local_in_port];



	mlxsw_sp_span_mirror_del(in_port, span_id, type, false);

	mlxsw_sp_port = mlxsw_sp->ports[local_in_port];

	mlxsw_sp_span_analyzed_port_put(mlxsw_sp_port, ingress);

	mlxsw_sp_span_agent_put(mlxsw_sp, span_id);

}



const struct mlxsw_afa_ops mlxsw_sp1_act_afa_ops = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE