netfilter: nf_tables: use list_del_rcu for netlink hooks
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH v7 1/4 netfilter: nf_tables: use list_del_rcu for netlink hooks
From: Florian Westphal <[email protected]>
nft_netdev_unregister_hooks and __nft_unregister_flowtable_net_hooks need to use list_del_rcu(), this list can be walked by concurrent dumpers.
Add a new helper and use it consistently.
--- net/netfilter/nf_tables_api.c | 44 ++++++++++++++--------------------- 1 file changed, 18 insertions(+), 26 deletions(-)
net/netfilter/nf_tables_api.c +18 -26
@@ -374,6 +374,12 @@ static void nft_netdev_hook_free_rcu(struct nft_hook *hook)call_rcu (&hook->rcu, __nft_netdev_hook_free_rcu); } +static void nft_netdev_hook_unlink_free_rcu (struct nft_hook *hook) +{ +list_del_rcu (&hook->list); +nft_netdev_hook_free_rcu (hook); +} +static void nft_netdev_unregister_hooks (struct net *net,struct list_head *hook_list,bool release_netdev)
@@ -384,10 +390,8 @@ static void nft_netdev_unregister_hooks(struct net *net,list_for_each_entry_safe (hook, next, hook_list, list) {list_for_each_entry (ops, &hook->ops_list, list)nf_unregister_net_hook (net, ops); -if (release_netdev) { -list_del (&hook->list); -nft_netdev_hook_free_rcu (hook); - } +if (release_netdev) +nft_netdev_hook_unlink_free_rcu (hook); } }
@@ -2271,10 +2275,8 @@ void nf_tables_chain_destroy(struct nft_chain *chain)if (nft_base_chain_netdev (table->family, basechain->ops.hooknum)) {list_for_each_entry_safe (hook, next, - &basechain->hook_list, list) { -list_del_rcu (&hook->list); -nft_netdev_hook_free_rcu (hook); - } + &basechain->hook_list, list) +nft_netdev_hook_unlink_free_rcu (hook); }module_put (basechain->type->owner);if (rcu_access_pointer (basechain->stats)) {
@@ -2974,6 +2976,7 @@ static int nf_tables_updchain(struct nft_ctx *ctx, u8 genmask, u8 policy,list_for_each_entry (ops, &h->ops_list, list)nf_unregister_net_hook (ctx->net, ops); } +/* hook.list is on stack, no need for list_del_rcu() */ list_del (&h->list);nft_netdev_hook_free_rcu (h); }
@@ -8852,10 +8855,8 @@ static void __nft_unregister_flowtable_net_hooks(struct net *net,list_for_each_entry_safe (hook, next, hook_list, list) {list_for_each_entry (ops, &hook->ops_list, list)nft_unregister_flowtable_ops (net, flowtable, ops); -if (release_netdev) { -list_del (&hook->list); -nft_netdev_hook_free_rcu (hook); - } +if (release_netdev) +nft_netdev_hook_unlink_free_rcu (hook); } }
@@ -8926,8 +8927,7 @@ static int nft_register_flowtable_net_hooks(struct net *net,nft_unregister_flowtable_ops (net, flowtable, ops); } -list_del_rcu (&hook->list); -nft_netdev_hook_free_rcu (hook); +nft_netdev_hook_unlink_free_rcu (hook); }return err;
@@ -8937,10 +8937,8 @@ static void nft_hooks_destroy(struct list_head *hook_list) {struct nft_hook *hook, *next; -list_for_each_entry_safe (hook, next, hook_list, list) { -list_del_rcu (&hook->list); -nft_netdev_hook_free_rcu (hook); - } +list_for_each_entry_safe (hook, next, hook_list, list) +nft_netdev_hook_unlink_free_rcu (hook); } static int nft_flowtable_update(struct nft_ctx *ctx, const struct nlmsghdr *nlh,
@@ -9028,8 +9026,7 @@ static int nft_flowtable_update(struct nft_ctx *ctx, const struct nlmsghdr *nlh,nft_unregister_flowtable_ops (ctx->net, flowtable, ops); } -list_del_rcu (&hook->list); -nft_netdev_hook_free_rcu (hook); +nft_netdev_hook_unlink_free_rcu (hook); }return err;
@@ -9535,13 +9532,8 @@ static void nf_tables_flowtable_notify(struct nft_ctx *ctx,static void nf_tables_flowtable_destroy (struct nft_flowtable *flowtable) { -struct nft_hook *hook, *next; - flowtable->data.type->free (&flowtable->data); -list_for_each_entry_safe (hook, next, &flowtable->hook_list, list) { -list_del_rcu (&hook->list); -nft_netdev_hook_free_rcu (hook); - } +nft_hooks_destroy (&flowtable->hook_list);kfree (flowtable->name);module_put (flowtable->data.type->owner);kfree (flowtable);
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH v7 2/4 rculist: add list_splice_rcu() for private lists
This patch adds a helper function, list_splice_rcu(), to safely splice a private (non-RCU-protected) list into an RCU-protected list.
The function ensures that only the pointer visible to RCU readers (prev->next) is updated using rcu_assign_pointer(), while the rest of the list manipulations are performed with regular assignments, as the source list is private and not visible to concurrent RCU readers.
This is useful for moving elements from a private list into a global RCU-protected list, ensuring safe publication for RCU readers. Subsystems with some sort of batching mechanism from userspace can benefit from this new function.
The function __list_splice_rcu() has been added for clarity and to follow the same pattern as in the existing list_splice*() interfaces, where there is a check to ensure that the list to splice is not empty. Note that __list_splice_rcu() has no documentation for this reason.
--- include/linux/rculist.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
include/linux/rculist.h +29 -0
@@ -261,6 +261,35 @@ static inline void list_replace_rcu(struct list_head *old, old->prev =LIST_POISON2 ; } +static inline void __list_splice_rcu (struct list_head *list, +struct list_head *prev, +struct list_head *next) +{ +struct list_head *first = list->next; +struct list_head *last = list->prev; + + last->next = next; + first->prev = prev; + next->prev = last; +rcu_assign_pointer (list_next_rcu (prev), first); +} + +/** +* list_splice_rcu - splice a non-RCU list into an RCU-protected list, +* designed for stacks. +* @list: the non RCU-protected list to splice +* @head: the place in the existing RCU-protected list to splice +* +* The list pointed to by @head can be RCU-read traversed concurrently with +* this function. +*/ +static inline void list_splice_rcu (struct list_head *list, +struct list_head *head) +{ +if (!list_empty (list)) +__list_splice_rcu (list, head, head->next); +} +/** * __list_splice_init_rcu - join an RCU-protected list into an existing list. * @list: the RCU-protected list to splice
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH v7 3/4 netfilter: nf_tables: join hook list via splice_list_rcu() in commit phase
In reply to Pablo Neira AyusoPublish new hooks in the list into the basechain/flowtable using splice_list_rcu() to ensure netlink dump list traversal via rcu is safe while concurrent ruleset update is going on.
--- net/netfilter/nf_tables_api.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +4 -4
@@ -10838,8 +10838,8 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)nft_chain_commit_update (nft_trans_container_chain (trans));nf_tables_chain_notify (&ctx,NFT_MSG_NEWCHAIN , &nft_trans_chain_hooks (trans)); -list_splice (&nft_trans_chain_hooks (trans), - &nft_trans_basechain (trans)->hook_list); +list_splice_rcu (&nft_trans_chain_hooks (trans), + &nft_trans_basechain (trans)->hook_list);/* trans destroyed after rcu grace period */ }else {nft_chain_commit_drop_policy (nft_trans_container_chain (trans));
@@ -10968,8 +10968,8 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)nft_trans_flowtable (trans), &nft_trans_flowtable_hooks (trans), NFT_MSG_NEWFLOWTABLE); -list_splice (&nft_trans_flowtable_hooks (trans), - &nft_trans_flowtable (trans)->hook_list); +list_splice_rcu (&nft_trans_flowtable_hooks (trans), + &nft_trans_flowtable (trans)->hook_list); }else {nft_clear (net,nft_trans_flowtable (trans)); nf_tables_flowtable_notify(&ctx,
Signature · 1 line
2.47.3
Pablo Neira Ayuso
maintainerPATCH v7 4/4 netfilter: nf_tables: add hook transactions for device deletions
In reply to Pablo Neira AyusoRestore the flag that indicates that the hook is going away, ie. NFT_HOOK_REMOVE, but add a new transaction object to track deletion of hooks without altering the basechain/flowtable hook_list during the preparation phase.
The existing approach that moves the hook from the basechain/flowtable hook_list to transaction hook_list breaks netlink dump path readers of this RCU-protected list.
It should be possible use an array for nft_trans_hook to store the deleted hooks to compact the representation but I am not expecting many hook object, specially now that wildcard support for devices is in place.
Note that the nft_trans_chain_hooks() list contains a list of struct nft_trans_hook objects for DELCHAIN and DELFLOWTABLE commands, while this list stores struct nft_hook objects for NEWCHAIN and NEWFLOWTABLE. Note that new commands can be updated to use nft_trans_hook for consistency.
This patch also adapts the event notification path to deal with the list of hook transactions.
--- include/net/netfilter/nf_tables.h | 13 ++ net/netfilter/nf_tables_api.c | 259 +++++++++++++++++++++++------- 2 files changed, 216 insertions(+), 56 deletions(-)
include/net/netfilter/nf_tables.h +13 -0
@@ -1204,12 +1204,15 @@ struct nft_stats {struct u64_stats_sync syncp; }; +#define NFT_HOOK_REMOVE (1 << 0) +struct nft_hook {struct list_head list;struct list_head ops_list;struct rcu_head rcu;char ifname[IFNAMSIZ ];u8 ifnamelen; +u8 flags; }; struct nf_hook_ops *nft_hook_find_ops(const struct nft_hook *hook,
@@ -1664,6 +1667,16 @@ struct nft_trans { u8 put_net:1; }; +/** +* struct nft_trans_hook - nf_tables hook update in transaction +* @list: used internally +* @hook: struct nft_hook with the device hook +*/ +struct nft_trans_hook { +struct list_head list; +struct nft_hook *hook; +}; +/** * struct nft_trans_binding - nf_tables object with binding support in transaction * @nft_trans: base structure, MUST be first member
net/netfilter/nf_tables_api.c +203 -56
495 lines not on this page · raw message
Signature · 1 line
2.47.3