Commit 19f06771 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

mlxsw: spectrum: Move flow offload binding into spectrum_flow.c 



Move the code taking case of setup of flow offload into spectrum_flow.c
Do small renaming of callbacks on the way.

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

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

+0 −173
Original line number Diff line number Diff line
@@ -1350,178 +1350,6 @@ static int mlxsw_sp_port_kill_vid(struct net_device *dev, 
	return 0;

}



static int

mlxsw_sp_setup_tc_cls_matchall(struct mlxsw_sp_flow_block *flow_block,

			       struct tc_cls_matchall_offload *f)

{

	switch (f->command) {

	case TC_CLSMATCHALL_REPLACE:

		return mlxsw_sp_mall_replace(flow_block, f);

	case TC_CLSMATCHALL_DESTROY:

		mlxsw_sp_mall_destroy(flow_block, f);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int

mlxsw_sp_setup_tc_cls_flower(struct mlxsw_sp_flow_block *flow_block,

			     struct flow_cls_offload *f)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_flow_block_mlxsw_sp(flow_block);



	switch (f->command) {

	case FLOW_CLS_REPLACE:

		return mlxsw_sp_flower_replace(mlxsw_sp, flow_block, f);

	case FLOW_CLS_DESTROY:

		mlxsw_sp_flower_destroy(mlxsw_sp, flow_block, f);

		return 0;

	case FLOW_CLS_STATS:

		return mlxsw_sp_flower_stats(mlxsw_sp, flow_block, f);

	case FLOW_CLS_TMPLT_CREATE:

		return mlxsw_sp_flower_tmplt_create(mlxsw_sp, flow_block, f);

	case FLOW_CLS_TMPLT_DESTROY:

		mlxsw_sp_flower_tmplt_destroy(mlxsw_sp, flow_block, f);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int mlxsw_sp_setup_tc_block_cb(enum tc_setup_type type,

				      void *type_data, void *cb_priv)

{

	struct mlxsw_sp_flow_block *flow_block = cb_priv;



	if (mlxsw_sp_flow_block_disabled(flow_block))

		return -EOPNOTSUPP;



	switch (type) {

	case TC_SETUP_CLSMATCHALL:

		return mlxsw_sp_setup_tc_cls_matchall(flow_block, type_data);

	case TC_SETUP_CLSFLOWER:

		return mlxsw_sp_setup_tc_cls_flower(flow_block, type_data);

	default:

		return -EOPNOTSUPP;

	}

}



static void mlxsw_sp_tc_block_release(void *cb_priv)

{

	struct mlxsw_sp_flow_block *flow_block = cb_priv;



	mlxsw_sp_flow_block_destroy(flow_block);

}



static LIST_HEAD(mlxsw_sp_block_cb_list);



static int mlxsw_sp_setup_tc_block_bind(struct mlxsw_sp_port *mlxsw_sp_port,

					struct flow_block_offload *f,

					bool ingress)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_flow_block *flow_block;

	struct flow_block_cb *block_cb;

	bool register_block = false;

	int err;



	block_cb = flow_block_cb_lookup(f->block, mlxsw_sp_setup_tc_block_cb,

					mlxsw_sp);

	if (!block_cb) {

		flow_block = mlxsw_sp_flow_block_create(mlxsw_sp, f->net);

		if (!flow_block)

			return -ENOMEM;

		block_cb = flow_block_cb_alloc(mlxsw_sp_setup_tc_block_cb,

					       mlxsw_sp, flow_block,

					       mlxsw_sp_tc_block_release);

		if (IS_ERR(block_cb)) {

			mlxsw_sp_flow_block_destroy(flow_block);

			err = PTR_ERR(block_cb);

			goto err_cb_register;

		}

		register_block = true;

	} else {

		flow_block = flow_block_cb_priv(block_cb);

	}

	flow_block_cb_incref(block_cb);

	err = mlxsw_sp_flow_block_bind(mlxsw_sp, flow_block,

				       mlxsw_sp_port, ingress, f->extack);

	if (err)

		goto err_block_bind;



	if (ingress)

		mlxsw_sp_port->ing_flow_block = flow_block;

	else

		mlxsw_sp_port->eg_flow_block = flow_block;



	if (register_block) {

		flow_block_cb_add(block_cb, f);

		list_add_tail(&block_cb->driver_list, &mlxsw_sp_block_cb_list);

	}



	return 0;



err_block_bind:

	if (!flow_block_cb_decref(block_cb))

		flow_block_cb_free(block_cb);

err_cb_register:

	return err;

}



static void mlxsw_sp_setup_tc_block_unbind(struct mlxsw_sp_port *mlxsw_sp_port,

					   struct flow_block_offload *f,

					   bool ingress)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_flow_block *flow_block;

	struct flow_block_cb *block_cb;

	int err;



	block_cb = flow_block_cb_lookup(f->block, mlxsw_sp_setup_tc_block_cb,

					mlxsw_sp);

	if (!block_cb)

		return;



	if (ingress)

		mlxsw_sp_port->ing_flow_block = NULL;

	else

		mlxsw_sp_port->eg_flow_block = NULL;



	flow_block = flow_block_cb_priv(block_cb);

	err = mlxsw_sp_flow_block_unbind(mlxsw_sp, flow_block,

					 mlxsw_sp_port, ingress);

	if (!err && !flow_block_cb_decref(block_cb)) {

		flow_block_cb_remove(block_cb, f);

		list_del(&block_cb->driver_list);

	}

}



static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,

				   struct flow_block_offload *f)

{

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

	case FLOW_BLOCK_BIND:

		return mlxsw_sp_setup_tc_block_bind(mlxsw_sp_port, f, ingress);

	case FLOW_BLOCK_UNBIND:

		mlxsw_sp_setup_tc_block_unbind(mlxsw_sp_port, f, ingress);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



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

			     void *type_data)

{
@@ -1545,7 +1373,6 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type, 
	}

}





static int mlxsw_sp_feature_hw_tc(struct net_device *dev, bool enable)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

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

+2 −9
Original line number Diff line number Diff line
@@ -708,15 +708,8 @@ 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_flow_block_bind(struct mlxsw_sp *mlxsw_sp,

			     struct mlxsw_sp_flow_block *block,

			     struct mlxsw_sp_port *mlxsw_sp_port,

			     bool ingress,

			     struct netlink_ext_ack *extack);

int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,

			       struct mlxsw_sp_flow_block *block,

			       struct mlxsw_sp_port *mlxsw_sp_port,

			       bool ingress);

int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,

			    struct flow_block_offload *f);



/* spectrum_acl.c */

struct mlxsw_sp_acl_ruleset;

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

+179 −9
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ mlxsw_sp_flow_block_ruleset_bound(const struct mlxsw_sp_flow_block *block) 
	return block->ruleset_zero;

}



int mlxsw_sp_flow_block_bind(struct mlxsw_sp *mlxsw_sp,

static int mlxsw_sp_flow_block_bind(struct mlxsw_sp *mlxsw_sp,

				    struct mlxsw_sp_flow_block *block,

				    struct mlxsw_sp_port *mlxsw_sp_port,

				    bool ingress,
@@ -104,7 +104,7 @@ err_binding_alloc: 
	return err;

}



int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,

static int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp,

				      struct mlxsw_sp_flow_block *block,

				      struct mlxsw_sp_port *mlxsw_sp_port,

				      bool ingress)
@@ -131,3 +131,173 @@ int mlxsw_sp_flow_block_unbind(struct mlxsw_sp *mlxsw_sp, 


	return 0;

}



static int mlxsw_sp_flow_block_mall_cb(struct mlxsw_sp_flow_block *flow_block,

				       struct tc_cls_matchall_offload *f)

{

	switch (f->command) {

	case TC_CLSMATCHALL_REPLACE:

		return mlxsw_sp_mall_replace(flow_block, f);

	case TC_CLSMATCHALL_DESTROY:

		mlxsw_sp_mall_destroy(flow_block, f);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int mlxsw_sp_flow_block_flower_cb(struct mlxsw_sp_flow_block *flow_block,

					 struct flow_cls_offload *f)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_flow_block_mlxsw_sp(flow_block);



	switch (f->command) {

	case FLOW_CLS_REPLACE:

		return mlxsw_sp_flower_replace(mlxsw_sp, flow_block, f);

	case FLOW_CLS_DESTROY:

		mlxsw_sp_flower_destroy(mlxsw_sp, flow_block, f);

		return 0;

	case FLOW_CLS_STATS:

		return mlxsw_sp_flower_stats(mlxsw_sp, flow_block, f);

	case FLOW_CLS_TMPLT_CREATE:

		return mlxsw_sp_flower_tmplt_create(mlxsw_sp, flow_block, f);

	case FLOW_CLS_TMPLT_DESTROY:

		mlxsw_sp_flower_tmplt_destroy(mlxsw_sp, flow_block, f);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}



static int mlxsw_sp_flow_block_cb(enum tc_setup_type type,

				  void *type_data, void *cb_priv)

{

	struct mlxsw_sp_flow_block *flow_block = cb_priv;



	if (mlxsw_sp_flow_block_disabled(flow_block))

		return -EOPNOTSUPP;



	switch (type) {

	case TC_SETUP_CLSMATCHALL:

		return mlxsw_sp_flow_block_mall_cb(flow_block, type_data);

	case TC_SETUP_CLSFLOWER:

		return mlxsw_sp_flow_block_flower_cb(flow_block, type_data);

	default:

		return -EOPNOTSUPP;

	}

}



static void mlxsw_sp_tc_block_release(void *cb_priv)

{

	struct mlxsw_sp_flow_block *flow_block = cb_priv;



	mlxsw_sp_flow_block_destroy(flow_block);

}



static LIST_HEAD(mlxsw_sp_block_cb_list);



static int mlxsw_sp_setup_tc_block_bind(struct mlxsw_sp_port *mlxsw_sp_port,

					struct flow_block_offload *f,

					bool ingress)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_flow_block *flow_block;

	struct flow_block_cb *block_cb;

	bool register_block = false;

	int err;



	block_cb = flow_block_cb_lookup(f->block, mlxsw_sp_flow_block_cb,

					mlxsw_sp);

	if (!block_cb) {

		flow_block = mlxsw_sp_flow_block_create(mlxsw_sp, f->net);

		if (!flow_block)

			return -ENOMEM;

		block_cb = flow_block_cb_alloc(mlxsw_sp_flow_block_cb,

					       mlxsw_sp, flow_block,

					       mlxsw_sp_tc_block_release);

		if (IS_ERR(block_cb)) {

			mlxsw_sp_flow_block_destroy(flow_block);

			err = PTR_ERR(block_cb);

			goto err_cb_register;

		}

		register_block = true;

	} else {

		flow_block = flow_block_cb_priv(block_cb);

	}

	flow_block_cb_incref(block_cb);

	err = mlxsw_sp_flow_block_bind(mlxsw_sp, flow_block,

				       mlxsw_sp_port, ingress, f->extack);

	if (err)

		goto err_block_bind;



	if (ingress)

		mlxsw_sp_port->ing_flow_block = flow_block;

	else

		mlxsw_sp_port->eg_flow_block = flow_block;



	if (register_block) {

		flow_block_cb_add(block_cb, f);

		list_add_tail(&block_cb->driver_list, &mlxsw_sp_block_cb_list);

	}



	return 0;



err_block_bind:

	if (!flow_block_cb_decref(block_cb))

		flow_block_cb_free(block_cb);

err_cb_register:

	return err;

}



static void mlxsw_sp_setup_tc_block_unbind(struct mlxsw_sp_port *mlxsw_sp_port,

					   struct flow_block_offload *f,

					   bool ingress)

{

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;

	struct mlxsw_sp_flow_block *flow_block;

	struct flow_block_cb *block_cb;

	int err;



	block_cb = flow_block_cb_lookup(f->block, mlxsw_sp_flow_block_cb,

					mlxsw_sp);

	if (!block_cb)

		return;



	if (ingress)

		mlxsw_sp_port->ing_flow_block = NULL;

	else

		mlxsw_sp_port->eg_flow_block = NULL;



	flow_block = flow_block_cb_priv(block_cb);

	err = mlxsw_sp_flow_block_unbind(mlxsw_sp, flow_block,

					 mlxsw_sp_port, ingress);

	if (!err && !flow_block_cb_decref(block_cb)) {

		flow_block_cb_remove(block_cb, f);

		list_del(&block_cb->driver_list);

	}

}



int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port,

			    struct flow_block_offload *f)

{

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

	case FLOW_BLOCK_BIND:

		return mlxsw_sp_setup_tc_block_bind(mlxsw_sp_port, f, ingress);

	case FLOW_BLOCK_UNBIND:

		mlxsw_sp_setup_tc_block_unbind(mlxsw_sp_port, f, ingress);

		return 0;

	default:

		return -EOPNOTSUPP;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE