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

mlxsw: spectrum_matchall: Pass matchall entry to sampling operations 



The entry will be required by the next patches, so pass it. No
functional changes intended.

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

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

+6 −3
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct mlxsw_sp_ptp_state; 
struct mlxsw_sp_ptp_ops;

struct mlxsw_sp_span_ops;

struct mlxsw_sp_qdisc_state;

struct mlxsw_sp_mall_entry;



struct mlxsw_sp_port_mapping {

	u8 module;
@@ -1035,10 +1036,12 @@ extern const struct mlxsw_afk_ops mlxsw_sp2_afk_ops; 
/* spectrum_matchall.c */

struct mlxsw_sp_mall_ops {

	int (*sample_add)(struct mlxsw_sp *mlxsw_sp,

			  struct mlxsw_sp_port *mlxsw_sp_port, bool ingress,

			  u32 rate, struct netlink_ext_ack *extack);

			  struct mlxsw_sp_port *mlxsw_sp_port,

			  struct mlxsw_sp_mall_entry *mall_entry,

			  struct netlink_ext_ack *extack);

	void (*sample_del)(struct mlxsw_sp *mlxsw_sp,

			   struct mlxsw_sp_port *mlxsw_sp_port);

			   struct mlxsw_sp_port *mlxsw_sp_port,

			   struct mlxsw_sp_mall_entry *mall_entry);

};



extern const struct mlxsw_sp_mall_ops mlxsw_sp1_mall_ops;

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

+16 −11
Original line number Diff line number Diff line
@@ -114,8 +114,7 @@ mlxsw_sp_mall_port_sample_add(struct mlxsw_sp_port *mlxsw_sp_port, 
	rcu_assign_pointer(mlxsw_sp_port->sample, &mall_entry->sample);



	err = mlxsw_sp->mall_ops->sample_add(mlxsw_sp, mlxsw_sp_port,

					     mall_entry->ingress,

					     mall_entry->sample.rate, extack);

					     mall_entry, extack);

	if (err)

		goto err_port_sample_set;

	return 0;
@@ -126,14 +125,15 @@ mlxsw_sp_mall_port_sample_add(struct mlxsw_sp_port *mlxsw_sp_port, 
}



static void

mlxsw_sp_mall_port_sample_del(struct mlxsw_sp_port *mlxsw_sp_port)

mlxsw_sp_mall_port_sample_del(struct mlxsw_sp_port *mlxsw_sp_port,

			      struct mlxsw_sp_mall_entry *mall_entry)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;



	if (!mlxsw_sp_port->sample)

		return;



	mlxsw_sp->mall_ops->sample_del(mlxsw_sp, mlxsw_sp_port);

	mlxsw_sp->mall_ops->sample_del(mlxsw_sp, mlxsw_sp_port, mall_entry);

	RCU_INIT_POINTER(mlxsw_sp_port->sample, NULL);

}
@@ -164,7 +164,7 @@ mlxsw_sp_mall_port_rule_del(struct mlxsw_sp_port *mlxsw_sp_port, 
		mlxsw_sp_mall_port_mirror_del(mlxsw_sp_port, mall_entry);

		break;

	case MLXSW_SP_MALL_ACTION_TYPE_SAMPLE:

		mlxsw_sp_mall_port_sample_del(mlxsw_sp_port);

		mlxsw_sp_mall_port_sample_del(mlxsw_sp_port, mall_entry);

		break;

	default:

		WARN_ON(1);
@@ -366,10 +366,12 @@ int mlxsw_sp_mall_prio_get(struct mlxsw_sp_flow_block *block, u32 chain_index, 


static int mlxsw_sp1_mall_sample_add(struct mlxsw_sp *mlxsw_sp,

				     struct mlxsw_sp_port *mlxsw_sp_port,

				     bool ingress, u32 rate,

				     struct mlxsw_sp_mall_entry *mall_entry,

				     struct netlink_ext_ack *extack)

{

	if (!ingress) {

	u32 rate = mall_entry->sample.rate;



	if (!mall_entry->ingress) {

		NL_SET_ERR_MSG(extack, "Sampling is not supported on egress");

		return -EOPNOTSUPP;

	}
@@ -383,7 +385,8 @@ static int mlxsw_sp1_mall_sample_add(struct mlxsw_sp *mlxsw_sp, 
}



static void mlxsw_sp1_mall_sample_del(struct mlxsw_sp *mlxsw_sp,

				      struct mlxsw_sp_port *mlxsw_sp_port)

				      struct mlxsw_sp_port *mlxsw_sp_port,

				      struct mlxsw_sp_mall_entry *mall_entry)

{

	mlxsw_sp_mall_port_sample_set(mlxsw_sp_port, false, 1);

}
@@ -395,7 +398,7 @@ const struct mlxsw_sp_mall_ops mlxsw_sp1_mall_ops = { 


static int mlxsw_sp2_mall_sample_add(struct mlxsw_sp *mlxsw_sp,

				     struct mlxsw_sp_port *mlxsw_sp_port,

				     bool ingress, u32 rate,

				     struct mlxsw_sp_mall_entry *mall_entry,

				     struct netlink_ext_ack *extack)

{

	struct mlxsw_sp_span_trigger_parms trigger_parms = {};
@@ -404,9 +407,10 @@ static int mlxsw_sp2_mall_sample_add(struct mlxsw_sp *mlxsw_sp, 
		.session_id = MLXSW_SP_SPAN_SESSION_ID_SAMPLING,

	};

	struct mlxsw_sp_port_sample *sample;

	u32 rate = mall_entry->sample.rate;

	int err;



	if (!ingress) {

	if (!mall_entry->ingress) {

		NL_SET_ERR_MSG(extack, "Sampling is not supported on egress");

		return -EOPNOTSUPP;

	}
@@ -444,7 +448,8 @@ static int mlxsw_sp2_mall_sample_add(struct mlxsw_sp *mlxsw_sp, 
}



static void mlxsw_sp2_mall_sample_del(struct mlxsw_sp *mlxsw_sp,

				      struct mlxsw_sp_port *mlxsw_sp_port)

				      struct mlxsw_sp_port *mlxsw_sp_port,

				      struct mlxsw_sp_mall_entry *mall_entry)

{

	struct mlxsw_sp_span_trigger_parms trigger_parms = {};

	struct mlxsw_sp_port_sample *sample;