Commit c9f14470 authored by Vlad Buslov's avatar Vlad Buslov Committed by David S. Miller
Browse files

net: sched: add API for registering unlocked offload block callbacks 



Extend struct flow_block_offload with "unlocked_driver_cb" flag to allow
registering and unregistering block hardware offload callbacks that do not
require caller to hold rtnl lock. Extend tcf_block with additional
lockeddevcnt counter that is incremented for each non-unlocked driver
callback attached to device. This counter is necessary to conditionally
obtain rtnl lock before calling hardware callbacks in following patches.

Register mlx5 tc block offload callbacks as "unlocked".

Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a449a3e7

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

+2 −0
Original line number Diff line number Diff line
@@ -3470,10 +3470,12 @@ static int mlx5e_setup_tc(struct net_device *dev, enum tc_setup_type type, 
			  void *type_data)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct flow_block_offload *f = type_data;



	switch (type) {

#ifdef CONFIG_MLX5_ESWITCH

	case TC_SETUP_BLOCK:

		f->unlocked_driver_cb = true;

		return flow_block_cb_setup_simple(type_data,

						  &mlx5e_block_cb_list,

						  mlx5e_setup_tc_block_cb,

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

+3 −0
Original line number Diff line number Diff line
@@ -763,6 +763,7 @@ mlx5e_rep_indr_setup_tc_block(struct net_device *netdev, 
	if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)

		return -EOPNOTSUPP;



	f->unlocked_driver_cb = true;

	f->driver_block_list = &mlx5e_block_cb_list;



	switch (f->command) {
@@ -1245,9 +1246,11 @@ static int mlx5e_rep_setup_tc(struct net_device *dev, enum tc_setup_type type, 
			      void *type_data)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct flow_block_offload *f = type_data;



	switch (type) {

	case TC_SETUP_BLOCK:

		f->unlocked_driver_cb = true;

		return flow_block_cb_setup_simple(type_data,

						  &mlx5e_rep_block_cb_list,

						  mlx5e_rep_setup_tc_cb,

include/net/flow_offload.h

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ struct flow_block_offload { 
	enum flow_block_command command;

	enum flow_block_binder_type binder_type;

	bool block_shared;

	bool unlocked_driver_cb;

	struct net *net;

	struct flow_block *block;

	struct list_head cb_list;

include/net/sch_generic.h

+1 −0
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ struct tcf_block { 
	bool keep_dst;

	atomic_t offloadcnt; /* Number of oddloaded filters */

	unsigned int nooffloaddevcnt; /* Number of devs unable to do offload */

	unsigned int lockeddevcnt; /* Number of devs that require rtnl lock. */

	struct {

		struct tcf_chain *chain;

		struct list_head filter_chain_list;

net/sched/cls_api.c

+6 −0
Original line number Diff line number Diff line
@@ -1418,6 +1418,8 @@ static int tcf_block_bind(struct tcf_block *block, 
						  bo->extack);

		if (err)

			goto err_unroll;

		if (!bo->unlocked_driver_cb)

			block->lockeddevcnt++;



		i++;

	}
@@ -1433,6 +1435,8 @@ err_unroll: 
						    block_cb->cb_priv, false,

						    tcf_block_offload_in_use(block),

						    NULL);

			if (!bo->unlocked_driver_cb)

				block->lockeddevcnt--;

		}

		flow_block_cb_free(block_cb);

	}
@@ -1454,6 +1458,8 @@ static void tcf_block_unbind(struct tcf_block *block, 
					    NULL);

		list_del(&block_cb->list);

		flow_block_cb_free(block_cb);

		if (!bo->unlocked_driver_cb)

			block->lockeddevcnt--;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE