nf_tables: atomic transactional updates (v2)
Subsystems (2)
[email protected]
maintainercover nf_tables: atomic transactional updates (v2)
From: Pablo Neira Ayuso <[email protected]>
Hi,
This patchset comes after this patch:
http://patchwork.ozlabs.org/patch/224196/
and results from discussion with Tomasz and Patrick, the summary of changes for the first patch are:
* Get rid of the extra struct list_head per rule as discussed with Patrick McHardy. With this patch, a temporary object is allocated to store the rule update information.
* A new begin operation to explicitly enter the transaction mode, and remove the COMMIT flag per rule, as suggested by Tomasz.
* The commit and abort loops have been also simplified from ideas extracted after discusion with Tomasz Bursztyka. Basically, there is a single list per net namespace that contains pending rule updates.
* The transaction list is now owned by the netlink socket portid that adds the first rule that waits to be committed. If another process wants to perform some rule-set update, it hits -EBUSY.
* Pending updates, if not committed, are destroyed when the process explicit aborts or finishes its execution.
The second patch uses NLM_F_DUMP_INTR if the dump in interrupted by an update.
Comments welcome.
Pablo Neira Ayuso (2):
netfilter: nf_tables: rework atomic transaction updates
netfilter: nf_tables: set NLM_F_DUMP_INTR if dump is invalid
include/net/netfilter/nf_tables.h | 21 ++- include/net/netns/nftables.h | 4 +- include/uapi/linux/netfilter/nf_tables.h | 7 +- net/netfilter/nf_tables_api.c | 242 +++++++++++++++++++----------- 4 files changed, 179 insertions(+), 95 deletions(-)
Signature · 1 line
1.7.10.4
[email protected]
maintainerPATCH 1/2 netfilter: nf_tables: rework atomic transaction updates
From: Pablo Neira Ayuso <[email protected]>
This patch partially reworks the commit operation (added in 1577831), main changes are:
* Get rid of the extra struct list_head per rule as discussed with Patrick McHardy. With this patch, a temporary object is allocated to store the rule update information.
* A new begin operation to explicitly enter the transaction mode, and remove the COMMIT flag per rule, as suggested by Tomasz.
* The commit and abort loops have been also simplified from ideas extracted after discusion with Tomasz Bursztyka. Basically, there is a single list per net namespace that contains pending rule updates.
* The transaction list is now owned by the netlink socket portid that adds the first rule that waits to be committed. If another process wants to perform some rule-set update, it hits -EBUSY.
* Pending updates, if not committed, are destroyed when the process explicit aborts or finishes its execution.
--- include/net/netfilter/nf_tables.h | 21 ++- include/net/netns/nftables.h | 2 + include/uapi/linux/netfilter/nf_tables.h | 7 +- net/netfilter/nf_tables_api.c | 232 ++++++++++++++++++++---------- 4 files changed, 174 insertions(+), 88 deletions(-)
include/net/netfilter/nf_tables.h +17 -4
@@ -321,7 +321,6 @@ static inline void *nft_expr_priv(const struct nft_expr *expr)* struct nft_rule - nf_tables rule * * @list: used internally -* @dirty_list: this rule needs an update after new generation * @rcu_head: used internally for rcu * @handle: rule handle * @genmask: generation mask
@@ -330,7 +329,6 @@ static inline void *nft_expr_priv(const struct nft_expr *expr)*/ struct nft_rule {struct list_head list; -struct list_head dirty_list;struct rcu_head rcu_head;u64 handle:46 , genmask:2,
@@ -339,6 +337,23 @@ struct nft_rule { __attribute__((aligned(__alignof__(struct nft_expr)))); }; +/** +* struct nft_rule_trans - nf_tables rule update in transaction +* +* @list: used internally +* @rule: rule that needs to be updated +* @chain: chain that this rule belongs to +* @table: table for which this chain applies +* @net: the net namespace that this rule updates belongs to +*/ +struct nft_rule_trans { +struct list_head list; +struct nft_rule *rule; +const struct nft_chain *chain; +const struct nft_table *table; +struct net *net; +}; +static inline struct nft_expr *nft_expr_first (const struct nft_rule *rule) {return (struct nft_expr *)&rule->data[0 ];
@@ -372,7 +387,6 @@ enum nft_chain_flags {* struct nft_chain - nf_tables chain * * @rules: list of rules in the chain -* @dirty_rules: rules that need an update after next generation * @list: used internally * @rcu_head: used internally * @net: net namespace that this chain belongs to
@@ -385,7 +399,6 @@ enum nft_chain_flags {*/ struct nft_chain {struct list_head rules; -struct list_head dirty_rules;struct list_head list;struct rcu_head rcu_head;struct net *net;
include/net/netns/nftables.h +2 -0
@@ -10,6 +10,8 @@ struct netns_nftables {struct nft_af_info *ipv4;struct nft_af_info *ipv6;struct nft_af_info *bridge; +u32 transaction_owner; +struct list_head transaction_rules;u8 gencursor;u8 genctr; };
include/uapi/linux/netfilter/nf_tables.h +1 -6
@@ -37,6 +37,7 @@ enum nf_tables_msg_types {NFT_MSG_NEWSETELEM ,NFT_MSG_GETSETELEM ,NFT_MSG_DELSETELEM , +NFT_MSG_BEGIN ,NFT_MSG_COMMIT ,NFT_MSG_ABORT , NFT_MSG_MAX,
@@ -88,18 +89,12 @@ enum nft_chain_attributes { };#define NFTA_CHAIN_MAX (__NFTA_CHAIN_MAX - 1) -enum { -NFT_RULE_F_COMMIT = (1 <<0 ), -NFT_RULE_F_MASK =NFT_RULE_F_COMMIT , -}; -enum nft_rule_attributes {NFTA_RULE_UNSPEC ,NFTA_RULE_TABLE ,NFTA_RULE_CHAIN ,NFTA_RULE_HANDLE ,NFTA_RULE_EXPRESSIONS , -NFTA_RULE_FLAGS ,NFTA_RULE_COMPAT , __NFTA_RULE_MAX };
net/netfilter/nf_tables_api.c +154 -78
381 lines not on this page · raw message
Signature · 1 line
1.7.10.4
Re: [PATCH 1/2] netfilter: nf_tables: rework atomic transaction updates
Hi Pablo,
Quoted 2 lines
* A new begin operation to explicitly enter the transaction mode, and remove the COMMIT flag per rule, as suggested by Tomasz.
Could you split your patch to 2?
- one which removes this flag and add *BEGIN* message stuff
- and a the later one which propose the rest
include/uapi/linux/netfilter/nf_tables.h enum nf_tables_msg_types { · line 43
Quoted 9 lines
+++
b/include/uapi/linux/netfilter/nf_tables.hinclude/uapi/linux/netfilter/nf_tables.h +1
-0@@ -37,6 +37,7 @@ enum nf_tables_msg_types {NFT_MSG_NEWSETELEM ,NFT_MSG_GETSETELEM ,NFT_MSG_DELSETELEM , +NFT_MSG_BEGIN ,NFT_MSG_COMMIT ,NFT_MSG_ABORT , NFT_MSG_MAX,
Still, I think it's awkward to propose a fully-explicit message name for all but for the transaction ones. NFT_MSG_BEGINTRANSACT or something like that, would be better.
Br,
Tomasz
[email protected]
maintainerPATCH 2/2 netfilter: nf_tables: set NLM_F_DUMP_INTR if dump is invalid
In reply to [email protected]From: Pablo Neira Ayuso <[email protected]>
Use nl_dump_check_consistent to set NLM_F_DUMP_INTR to tell user-space that it has to retry in this dump. Just like in rtnetlink.
--- include/net/netns/nftables.h | 2 +- net/netfilter/nf_tables_api.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-)
include/net/netns/nftables.h +1 -1
@@ -12,8 +12,8 @@ struct netns_nftables {struct nft_af_info *bridge;u32 transaction_owner;struct list_head transaction_rules; +unsigned int base_seq; u8 gencursor; - u8 genctr; };#endif
net/netfilter/nf_tables_api.c +5 -6
@@ -1400,8 +1400,8 @@ static int nf_tables_dump_rules(struct sk_buff *skb,unsigned int idx =0 , s_idx = cb->args[0 ];struct net *net =sock_net (skb->sk);int family = nfmsg->nfgen_family; -u8 genctr =ACCESS_ONCE (net->nft.genctr); -u8 gencursor =ACCESS_ONCE (net->nft.gencursor); + + cb->seq =ACCESS_ONCE (net->nft.base_seq);list_for_each_entry (afi, &net->nft.af_info, list) {if (family !=NFPROTO_UNSPEC && family != afi->family)
@@ -1430,9 +1430,7 @@ cont: } } done: -/* Invalidate this dump, a transition to the new generation happened */ -if (gencursor != net->nft.gencursor || genctr != net->nft.genctr) -return -EBUSY ; +nl_dump_check_consistent (cb,nlmsg_hdr (skb)); cb->args[0 ] = idx;return skb->len;
@@ -1776,7 +1774,7 @@ static int nf_tables_commit(struct sock *nlsk, struct sk_buff *skb,return PTR_ERR (afi);/* Bump generation counter, invalidate any dump in progress */ - net->nft.genctr++; +while (++net->nft.base_seq ==0 );/* A new generation has just started */ net->nft.gencursor =gencursor_next (net);
@@ -3238,6 +3236,7 @@ static int nf_tables_init_net(struct net *net) {INIT_LIST_HEAD (&net->nft.af_info);INIT_LIST_HEAD (&net->nft.transaction_rules); + net->nft.base_seq =1 ;return 0 ; }
Signature · 1 line
1.7.10.4