Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

net: flow_offload: add flow_block_cb_is_busy() and use it 



This patch adds a function to check if flow block callback is already in
use.  Call this new function from flow_block_cb_setup_simple() and from
drivers.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 722d36e6

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

+4 −0
Original line number Diff line number Diff line
@@ -722,6 +722,10 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev, 
		if (indr_priv)

			return -EEXIST;



		if (flow_block_cb_is_busy(mlx5e_rep_indr_setup_block_cb,

					  indr_priv, &mlx5e_block_cb_list))

			return -EBUSY;



		indr_priv = kmalloc(sizeof(*indr_priv), GFP_KERNEL);

		if (!indr_priv)

			return -ENOMEM;

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

+4 −0
Original line number Diff line number Diff line
@@ -1698,6 +1698,10 @@ static int mlxsw_sp_setup_tc_block(struct mlxsw_sp_port *mlxsw_sp_port, 


	switch (f->command) {

	case FLOW_BLOCK_BIND:

		if (flow_block_cb_is_busy(cb, mlxsw_sp_port,

					  &mlxsw_sp_block_cb_list))

			return -EBUSY;



		block_cb = flow_block_cb_alloc(f->net, cb, mlxsw_sp_port,

					       mlxsw_sp_port, NULL);

		if (IS_ERR(block_cb))

drivers/net/ethernet/mscc/ocelot_tc.c

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ static int ocelot_setup_tc_block(struct ocelot_port *port, 


	switch (f->command) {

	case FLOW_BLOCK_BIND:

		if (flow_block_cb_is_busy(cb, port, &ocelot_block_cb_list))

			return -EBUSY;



		block_cb = flow_block_cb_alloc(f->net, cb, port, port, NULL);

		if (IS_ERR(block_cb))

			return PTR_ERR(block_cb);

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

+4 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,10 @@ static int nfp_flower_setup_tc_block(struct net_device *netdev, 


	switch (f->command) {

	case FLOW_BLOCK_BIND:

		if (flow_block_cb_is_busy(nfp_flower_setup_tc_block_cb, repr,

					  &nfp_block_cb_list))

			return -EBUSY;



		block_cb = flow_block_cb_alloc(f->net,

					       nfp_flower_setup_tc_block_cb,

					       repr, repr, NULL);

include/net/flow_offload.h

+3 −0
Original line number Diff line number Diff line
@@ -296,6 +296,9 @@ static inline void flow_block_cb_remove(struct flow_block_cb *block_cb, 
	list_move(&block_cb->list, &offload->cb_list);

}



bool flow_block_cb_is_busy(tc_setup_cb_t *cb, void *cb_ident,

			   struct list_head *driver_block_list);



int flow_block_cb_setup_simple(struct flow_block_offload *f,

			       struct list_head *driver_list, tc_setup_cb_t *cb,

			       void *cb_ident, void *cb_priv, bool ingress_only);