Commit 14bfb13f authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

net: flow_offload: add flow_block structure and use it 



This object stores the flow block callbacks that are attached to this
block. Update flow_block_cb_lookup() to take this new object.

This patch restores the block sharing feature.

Fixes: da3eeb90 ("net: flow_offload: add list handling functions")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a7323311

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+1 −1
Original line number Diff line number Diff line
@@ -752,7 +752,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev, 
		if (!indr_priv)

			return -ENOENT;



		block_cb = flow_block_cb_lookup(f,

		block_cb = flow_block_cb_lookup(f->block,

						mlx5e_rep_indr_setup_block_cb,

						indr_priv);

		if (!block_cb)

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

+5 −3
Original line number Diff line number Diff line
@@ -1604,7 +1604,8 @@ mlxsw_sp_setup_tc_block_flower_bind(struct mlxsw_sp_port *mlxsw_sp_port, 
	bool register_block = false;

	int err;



	block_cb = flow_block_cb_lookup(f, mlxsw_sp_setup_tc_block_cb_flower,

	block_cb = flow_block_cb_lookup(f->block,

					mlxsw_sp_setup_tc_block_cb_flower,

					mlxsw_sp);

	if (!block_cb) {

		acl_block = mlxsw_sp_acl_block_create(mlxsw_sp, f->net);
@@ -1656,7 +1657,8 @@ mlxsw_sp_setup_tc_block_flower_unbind(struct mlxsw_sp_port *mlxsw_sp_port, 
	struct flow_block_cb *block_cb;

	int err;



	block_cb = flow_block_cb_lookup(f, mlxsw_sp_setup_tc_block_cb_flower,

	block_cb = flow_block_cb_lookup(f->block,

					mlxsw_sp_setup_tc_block_cb_flower,

					mlxsw_sp);

	if (!block_cb)

		return;
@@ -1717,7 +1719,7 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, 
	case FLOW_BLOCK_UNBIND:

		mlxsw_sp_setup_tc_block_flower_unbind(mlxsw_sp_port,

						      f, ingress);

		block_cb = flow_block_cb_lookup(f, cb, mlxsw_sp_port);

		block_cb = flow_block_cb_lookup(f->block, cb, mlxsw_sp_port);

		if (!block_cb)

			return -ENOENT;

drivers/net/ethernet/mscc/ocelot_flower.c

+4 −4
Original line number Diff line number Diff line
@@ -316,8 +316,8 @@ int ocelot_setup_tc_block_flower_bind(struct ocelot_port *port, 
	if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS)

		return -EOPNOTSUPP;



	block_cb = flow_block_cb_lookup(f, ocelot_setup_tc_block_cb_flower,

					port);

	block_cb = flow_block_cb_lookup(f->block,

					ocelot_setup_tc_block_cb_flower, port);

	if (!block_cb) {

		port_block = ocelot_port_block_create(port);

		if (!port_block)
@@ -350,8 +350,8 @@ void ocelot_setup_tc_block_flower_unbind(struct ocelot_port *port, 
{

	struct flow_block_cb *block_cb;



	block_cb = flow_block_cb_lookup(f, ocelot_setup_tc_block_cb_flower,

					port);

	block_cb = flow_block_cb_lookup(f->block,

					ocelot_setup_tc_block_cb_flower, port);

	if (!block_cb)

		return;

drivers/net/ethernet/mscc/ocelot_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int ocelot_setup_tc_block(struct ocelot_port *port, 
		list_add_tail(&block_cb->driver_list, f->driver_block_list);

		return 0;

	case FLOW_BLOCK_UNBIND:

		block_cb = flow_block_cb_lookup(f, cb, port);

		block_cb = flow_block_cb_lookup(f->block, cb, port);

		if (!block_cb)

			return -ENOENT;

drivers/net/ethernet/netronome/nfp/flower/offload.c

+3 −2
Original line number Diff line number Diff line
@@ -1327,7 +1327,8 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, 
		list_add_tail(&block_cb->driver_list, &nfp_block_cb_list);

		return 0;

	case FLOW_BLOCK_UNBIND:

		block_cb = flow_block_cb_lookup(f, nfp_flower_setup_tc_block_cb,

		block_cb = flow_block_cb_lookup(f->block,

						nfp_flower_setup_tc_block_cb,

						repr);

		if (!block_cb)

			return -ENOENT;
@@ -1440,7 +1441,7 @@ nfp_flower_setup_indr_tc_block(struct net_device *netdev, struct nfp_app *app, 
		if (!cb_priv)

			return -ENOENT;



		block_cb = flow_block_cb_lookup(f,

		block_cb = flow_block_cb_lookup(f->block,

						nfp_flower_setup_indr_block_cb,

						cb_priv);

		if (!block_cb)