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

Commit 3474a2c6 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_tables_offload: move indirect flow_block callback logic to core 



Add nft_offload_init() and nft_offload_exit() function to deal with the
init and the exit path of the offload infrastructure.

Rename nft_indr_block_get_and_ing_cmd() to nft_indr_block_cb().

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent b44492af

include/net/netfilter/nf_tables_offload.h

+3 −4
Original line number Diff line number Diff line
@@ -64,10 +64,6 @@ 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	=					\
@@ -80,4 +76,7 @@ void nft_indr_block_get_and_ing_cmd(struct net_device *dev, 


int nft_chain_offload_priority(struct nft_base_chain *basechain);



void nft_offload_init(void);

void nft_offload_exit(void);



#endif

net/netfilter/nf_tables_api.c

+3 −7
Original line number Diff line number Diff line
@@ -7669,11 +7669,6 @@ static struct pernet_operations nf_tables_net_ops = { 
	.exit	= nf_tables_exit_net,

};



static struct flow_indr_block_ing_entry block_ing_entry = {

	.cb = nft_indr_block_get_and_ing_cmd,

	.list = LIST_HEAD_INIT(block_ing_entry.list),

};



static int __init nf_tables_module_init(void)

{

	int err;
@@ -7705,7 +7700,8 @@ static int __init nf_tables_module_init(void) 
		goto err5;



	nft_chain_route_init();

	flow_indr_add_block_ing_cb(&block_ing_entry);

	nft_offload_init();



	return err;

err5:

	rhltable_destroy(&nft_objname_ht);
@@ -7722,7 +7718,7 @@ static int __init nf_tables_module_init(void) 


static void __exit nf_tables_module_exit(void)

{

	flow_indr_del_block_ing_cb(&block_ing_entry);

	nft_offload_exit();

	nfnetlink_subsys_unregister(&nf_tables_subsys);

	unregister_netdevice_notifier(&nf_tables_flowtable_notifier);

	nft_chain_filter_fini();

net/netfilter/nf_tables_offload.c

+18 −4
Original line number Diff line number Diff line
@@ -354,9 +354,8 @@ int nft_flow_rule_offload_commit(struct net *net) 
	return err;

}



void nft_indr_block_get_and_ing_cmd(struct net_device *dev,

				    flow_indr_block_bind_cb_t *cb,

				    void *cb_priv,

static void nft_indr_block_cb(struct net_device *dev,

			      flow_indr_block_bind_cb_t *cb, void *cb_priv,

			      enum flow_block_command command)

{

	struct net *net = dev_net(dev);
@@ -383,3 +382,18 @@ void nft_indr_block_get_and_ing_cmd(struct net_device *dev, 
		}

	}

}



static struct flow_indr_block_ing_entry block_ing_entry = {

	.cb	= nft_indr_block_cb,

	.list	= LIST_HEAD_INIT(block_ing_entry.list),

};



void nft_offload_init(void)

{

	flow_indr_add_block_ing_cb(&block_ing_entry);

}



void nft_offload_exit(void)

{

	flow_indr_del_block_ing_cb(&block_ing_entry);

}