Commit f7a439cb authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

mlxsw: spectrum_flow: Promote binder-type dispatch to spectrum.c 



Two RED qevents have been introduced recently. From the point of view of a
driver, qevents are simply blocks with unusual binder types. However they
need to be handled by different logic than ACL-like flows.

Thus rename mlxsw_sp_setup_tc_block() to mlxsw_sp_setup_tc_block_clsact()
and move the binder-type dispatch from there to spectrum.c into a new
function of the original name. The new dispatcher is easier to extend with
new binder types.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b50f60a0

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

+13 −0
Original line number Diff line number Diff line
@@ -1329,6 +1329,19 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev, 
	return 0;

}



static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,

				   struct flow_block_offload *f)

{

	switch (f->binder_type) {

	case FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS:

		return mlxsw_sp_setup_tc_block_clsact(mlxsw_sp_port, f, true);

	case FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS:

		return mlxsw_sp_setup_tc_block_clsact(mlxsw_sp_port, f, false);

	default:

		return -EOPNOTSUPP;

	}

}



static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type,

			     void *type_data)

{

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

+3 −2
Original line number Diff line number Diff line
@@ -767,8 +767,9 @@ mlxsw_sp_flow_block_is_mixed_bound(const struct mlxsw_sp_flow_block *block) 
struct mlxsw_sp_flow_block *mlxsw_sp_flow_block_create(struct mlxsw_sp *mlxsw_sp,

						       struct net *net);

void mlxsw_sp_flow_block_destroy(struct mlxsw_sp_flow_block *block);

int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,

			    struct flow_block_offload *f);

int mlxsw_sp_setup_tc_block_clsact(struct mlxsw_sp_port *mlxsw_sp_port,

				   struct flow_block_offload *f,

				   bool ingress);



/* spectrum_acl.c */

struct mlxsw_sp_acl_ruleset;

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

+3 −11
Original line number Diff line number Diff line
@@ -277,18 +277,10 @@ static void mlxsw_sp_setup_tc_block_unbind(struct mlxsw_sp_port *mlxsw_sp_port, 
	}

}



int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,

			    struct flow_block_offload *f)

int mlxsw_sp_setup_tc_block_clsact(struct mlxsw_sp_port *mlxsw_sp_port,

				   struct flow_block_offload *f,

				   bool ingress)

{

	bool ingress;



	if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

		ingress = true;

	else if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)

		ingress = false;

	else

		return -EOPNOTSUPP;



	f->driver_block_list = &mlxsw_sp_block_cb_list;



	switch (f->command) {