Commit 2339ef1c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'flow_offload-add-indr-block-in-nf_table_offload' 



wenxu says:

====================
flow_offload: add indr-block in nf_table_offload

This series patch make nftables offload support the vlan and
tunnel device offload through indr-block architecture.

The first four patches mv tc indr block to flow offload and
rename to flow-indr-block.
Because the new flow-indr-block can't get the tcf_block
directly. The fifth patch provide a callback list to get
flow_block of each subsystem immediately when the device
register and contain a block.
The last patch make nf_tables_offload support flow-indr-block.

This version add a mutex lock for add/del flow_indr_block_ing_cb
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61552d2c 9a32669f

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

+5 −5
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ static int mlx5e_rep_indr_register_block(struct mlx5e_rep_priv *rpriv, 
{

	int err;



	err = __tc_indr_block_cb_register(netdev, rpriv,

	err = __flow_indr_block_cb_register(netdev, rpriv,

					    mlx5e_rep_indr_setup_tc_cb,

					    rpriv);

	if (err) {
@@ -796,7 +796,7 @@ static int mlx5e_rep_indr_register_block(struct mlx5e_rep_priv *rpriv, 
static void mlx5e_rep_indr_unregister_block(struct mlx5e_rep_priv *rpriv,

					    struct net_device *netdev)

{

	__tc_indr_block_cb_unregister(netdev, mlx5e_rep_indr_setup_tc_cb,

	__flow_indr_block_cb_unregister(netdev, mlx5e_rep_indr_setup_tc_cb,

					rpriv);

}

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

+6 −5
Original line number Diff line number Diff line
@@ -1649,7 +1649,7 @@ int nfp_flower_reg_indir_block_handler(struct nfp_app *app, 
		return NOTIFY_OK;



	if (event == NETDEV_REGISTER) {

		err = __tc_indr_block_cb_register(netdev, app,

		err = __flow_indr_block_cb_register(netdev, app,

						    nfp_flower_indr_setup_tc_cb,

						    app);

		if (err)
@@ -1657,8 +1657,9 @@ int nfp_flower_reg_indir_block_handler(struct nfp_app *app, 
					     "Indirect block reg failed - %s\n",

					     netdev->name);

	} else if (event == NETDEV_UNREGISTER) {

		__tc_indr_block_cb_unregister(netdev,

					      nfp_flower_indr_setup_tc_cb, app);

		__flow_indr_block_cb_unregister(netdev,

						nfp_flower_indr_setup_tc_cb,

						app);

	}



	return NOTIFY_OK;

include/net/flow_offload.h

+37 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/kernel.h>

#include <linux/list.h>

#include <net/flow_dissector.h>

#include <linux/rhashtable.h>



struct flow_match {

	struct flow_dissector	*dissector;
@@ -370,4 +371,40 @@ static inline void flow_block_init(struct flow_block *flow_block) 
	INIT_LIST_HEAD(&flow_block->cb_list);

}



typedef int flow_indr_block_bind_cb_t(struct net_device *dev, void *cb_priv,

				      enum tc_setup_type type, void *type_data);



typedef void flow_indr_block_ing_cmd_t(struct net_device *dev,

					flow_indr_block_bind_cb_t *cb,

					void *cb_priv,

					enum flow_block_command command);



struct flow_indr_block_ing_entry {

	flow_indr_block_ing_cmd_t *cb;

	struct list_head	list;

};



void flow_indr_add_block_ing_cb(struct flow_indr_block_ing_entry *entry);



void flow_indr_del_block_ing_cb(struct flow_indr_block_ing_entry *entry);



int __flow_indr_block_cb_register(struct net_device *dev, void *cb_priv,

				  flow_indr_block_bind_cb_t *cb,

				  void *cb_ident);



void __flow_indr_block_cb_unregister(struct net_device *dev,

				     flow_indr_block_bind_cb_t *cb,

				     void *cb_ident);



int flow_indr_block_cb_register(struct net_device *dev, void *cb_priv,

				flow_indr_block_bind_cb_t *cb, void *cb_ident);



void flow_indr_block_cb_unregister(struct net_device *dev,

				   flow_indr_block_bind_cb_t *cb,

				   void *cb_ident);



void flow_indr_block_call(struct net_device *dev,

			  struct flow_block_offload *bo,

			  enum flow_block_command command);



#endif /* _NET_FLOW_OFFLOAD_H */

include/net/netfilter/nf_tables_offload.h

+4 −0
Original line number Diff line number Diff line
@@ -63,6 +63,10 @@ struct nft_rule; 
struct nft_flow_rule *nft_flow_rule_create(const struct nft_rule *rule);

void nft_flow_rule_destroy(struct nft_flow_rule *flow);

int nft_flow_rule_offload_commit(struct net *net);

void nft_indr_block_get_and_ing_cmd(struct net_device *dev,

				    flow_indr_block_bind_cb_t *cb,

				    void *cb_priv,

				    enum flow_block_command command);



#define NFT_OFFLOAD_MATCH(__key, __base, __field, __len, __reg)		\

	(__reg)->base_offset	=					\

include/net/pkt_cls.h

+0 −35
Original line number Diff line number Diff line
@@ -70,15 +70,6 @@ static inline struct Qdisc *tcf_block_q(struct tcf_block *block) 
	return block->q;

}



int __tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,

				tc_indr_block_bind_cb_t *cb, void *cb_ident);

int tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,

			      tc_indr_block_bind_cb_t *cb, void *cb_ident);

void __tc_indr_block_cb_unregister(struct net_device *dev,

				   tc_indr_block_bind_cb_t *cb, void *cb_ident);

void tc_indr_block_cb_unregister(struct net_device *dev,

				 tc_indr_block_bind_cb_t *cb, void *cb_ident);



int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,

		 struct tcf_result *res, bool compat_mode);
@@ -137,32 +128,6 @@ void tc_setup_cb_block_unregister(struct tcf_block *block, flow_setup_cb_t *cb, 
{

}



static inline

int __tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,

				tc_indr_block_bind_cb_t *cb, void *cb_ident)

{

	return 0;

}



static inline

int tc_indr_block_cb_register(struct net_device *dev, void *cb_priv,

			      tc_indr_block_bind_cb_t *cb, void *cb_ident)

{

	return 0;

}



static inline

void __tc_indr_block_cb_unregister(struct net_device *dev,

				   tc_indr_block_bind_cb_t *cb, void *cb_ident)

{

}



static inline

void tc_indr_block_cb_unregister(struct net_device *dev,

				 tc_indr_block_bind_cb_t *cb, void *cb_ident)

{

}



static inline int tcf_classify(struct sk_buff *skb, const struct tcf_proto *tp,

			       struct tcf_result *res, bool compat_mode)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE