netfilter: nft_flow_offload: no need to flush entries on module removal
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/3 netfilter: nft_flow_offload: no need to flush entries on module removal
nft_flow_offload module removal does not require to flush existing flowtables, it is valid to remove this module while keeping flowtables around.
---
This patch is a dependency for bugfix in patch 3/3. PATCH 2/3 moves flowtable cleanup to the core, this patch saves us from exporting a function that we would need to unexport just thereafter. So remove it in first place to avoid unnecessary code churning.
net/netfilter/nft_flow_offload.c | 6 ------ 1 file changed, 6 deletions(-)
net/netfilter/nft_flow_offload.c +0 -6
@@ -247,14 +247,8 @@ static int __init nft_flow_offload_module_init(void) static void __exit nft_flow_offload_module_exit(void) { -struct net *net; -nft_unregister_expr (&nft_flow_offload_type);unregister_netdevice_notifier (&flow_offload_netdev_notifier); -rtnl_lock (); -for_each_net (net) -nft_flow_table_iterate (net, nft_flow_offload_iterate_cleanup,NULL ); -rtnl_unlock (); }module_init (nft_flow_offload_module_init);
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/3 netfilter: nft_flow_offload: move flowtable cleanup routines to nf_flow_table
Move the flowtable cleanup routines to nf_flow_table and expose the nf_flow_table_cleanup() helper function.
---
This is another dependency for the fix in patch 3/3.
include/net/netfilter/nf_flow_table.h | 3 +++ net/netfilter/nf_flow_table.c | 24 ++++++++++++++++++++++++ net/netfilter/nft_flow_offload.c | 19 +------------------ 3 files changed, 28 insertions(+), 18 deletions(-)
include/net/netfilter/nf_flow_table.h +3 -0
@@ -95,6 +95,9 @@ struct flow_offload_tuple_rhash *flow_offload_lookup(struct nf_flowtable *flow_tint nf_flow_table_iterate (struct nf_flowtable *flow_table,void (*iter)(struct flow_offload *flow,void *data),void *data); + +void nf_flow_table_cleanup (struct net *net,struct net_device *dev); +void nf_flow_offload_work_gc (struct work_struct *work);extern const struct rhashtable_params nf_flow_offload_rhash_params;
net/netfilter/nf_flow_table.c +24 -0
@@ -4,6 +4,7 @@#include <linux/netfilter.h> #include <linux/rhashtable.h> #include <linux/netdevice.h> +#include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_flow_table.h> #include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack_core.h>
@@ -425,5 +426,28 @@ int nf_flow_dnat_port(const struct flow_offload *flow, }EXPORT_SYMBOL_GPL (nf_flow_dnat_port); +static void nf_flow_table_do_cleanup (struct flow_offload *flow,void *data) +{ +struct net_device *dev = data; + +if (dev && flow->tuplehash[0 ].tuple.iifidx != dev->ifindex) +return ; + +flow_offload_dead (flow); +} + +static void nf_flow_table_iterate_cleanup (struct nf_flowtable *flowtable, +void *data) +{ +nf_flow_table_iterate (flowtable, nf_flow_table_do_cleanup, data); +flush_delayed_work (&flowtable->gc_work); +} + +void nf_flow_table_cleanup (struct net *net,struct net_device *dev) +{ +nft_flow_table_iterate (net, nf_flow_table_iterate_cleanup, dev); +} +EXPORT_SYMBOL_GPL (nf_flow_table_cleanup); +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );
net/netfilter/nft_flow_offload.c +1 -18
@@ -194,23 +194,6 @@ static struct nft_expr_type nft_flow_offload_type __read_mostly = { .owner = THIS_MODULE, }; -static void flow_offload_iterate_cleanup (struct flow_offload *flow,void *data) -{ -struct net_device *dev = data; - -if (dev && flow->tuplehash[0 ].tuple.iifidx != dev->ifindex) -return ; - -flow_offload_dead (flow); -} - -static void nft_flow_offload_iterate_cleanup (struct nf_flowtable *flowtable, -void *data) -{ -nf_flow_table_iterate (flowtable, flow_offload_iterate_cleanup, data); -flush_delayed_work (&flowtable->gc_work); -} -static int flow_offload_netdev_event (struct notifier_block *this,unsigned long event,void *ptr) {
@@ -219,7 +202,7 @@ static int flow_offload_netdev_event(struct notifier_block *this,if (event !=NETDEV_DOWN )return NOTIFY_DONE ; -nft_flow_table_iterate (dev_net (dev), nft_flow_offload_iterate_cleanup, dev); +nf_flow_table_cleanup (dev_net (dev), dev);return NOTIFY_DONE ; }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/3 netfilter: nf_tables: fix flowtable free
In reply to Pablo Neira AyusoEvery flow_offload entry is added into the table twice. Because of this, rhashtable_free_and_destroy can't be used, since it would call kfree for each flow_offload object twice.
This patch adds a call to nf_flow_table_iterate_cleanup() to schedule removal of entries, then there is an explicitly invocation of the garbage collector to clean up resources.
Based on patch from Felix Fietkau.
---
@Felix: This is an alternate path to fix what you're reporting, it's based
on your patch 1/2, but sets on the DYING flag, then there's an explicit call to the garbage collector. The reason for this is that rule of thumb is that entries should be always removed by the garbage collector, either by calling explicitly or implicitly. I think this simplifies the upcoming hardware offload support and it will allow us to introduce batching support from the garbage collector. Given adding/removing entries to hardware can be slow, we can amortize the cost by batching several add/delete commands.
include/net/netfilter/nf_flow_table.h | 2 ++ net/ipv4/netfilter/nf_flow_table_ipv4.c | 1 + net/ipv6/netfilter/nf_flow_table_ipv6.c | 1 + net/netfilter/nf_flow_table.c | 25 +++++++++++++++++++------ net/netfilter/nf_flow_table_inet.c | 1 + net/netfilter/nf_tables_api.c | 9 ++------- 6 files changed, 26 insertions(+), 13 deletions(-)
include/net/netfilter/nf_flow_table.h +2 -0
@@ -14,6 +14,7 @@ struct nf_flowtable_type {struct list_head list;int family;void (*gc)(struct work_struct *work); +void (*free)(struct nf_flowtable *ft);const struct rhashtable_params *params;nf_hookfn *hook;struct module *owner;
@@ -98,6 +99,7 @@ int nf_flow_table_iterate(struct nf_flowtable *flow_table,void nf_flow_table_cleanup (struct net *net,struct net_device *dev); +void nf_flow_table_free (struct nf_flowtable *flow_table);void nf_flow_offload_work_gc (struct work_struct *work);extern const struct rhashtable_params nf_flow_offload_rhash_params;
net/ipv4/netfilter/nf_flow_table_ipv4.c +1 -0
@@ -260,6 +260,7 @@ static struct nf_flowtable_type flowtable_ipv4 = { .family = NFPROTO_IPV4, .params = &nf_flow_offload_rhash_params, .gc = nf_flow_offload_work_gc, + .free = nf_flow_table_free, .hook = nf_flow_offload_ip_hook, .owner = THIS_MODULE, };
net/ipv6/netfilter/nf_flow_table_ipv6.c +1 -0
@@ -253,6 +253,7 @@ static struct nf_flowtable_type flowtable_ipv6 = { .family = NFPROTO_IPV6, .params = &nf_flow_offload_rhash_params, .gc = nf_flow_offload_work_gc, + .free = nf_flow_table_free, .hook = nf_flow_offload_ipv6_hook, .owner = THIS_MODULE, };
net/netfilter/nf_flow_table.c +19 -6
@@ -232,19 +232,16 @@ static inline bool nf_flow_is_dying(const struct flow_offload *flow)return flow->flags &FLOW_OFFLOAD_DYING ; } -void nf_flow_offload_work_gc (struct work_struct *work) +static int nf_flow_offload_gc_step (struct nf_flowtable *flow_table) {struct flow_offload_tuple_rhash *tuplehash; -struct nf_flowtable *flow_table;struct rhashtable_iter hti;struct flow_offload *flow;int err; - flow_table = container_of(work, struct nf_flowtable, gc_work.work); - err =rhashtable_walk_init (&flow_table->rhashtable, &hti,GFP_KERNEL );if (err) - goto schedule; +return 0 ;rhashtable_walk_start (&hti);
@@ -270,7 +267,16 @@ void nf_flow_offload_work_gc(struct work_struct *work) out:rhashtable_walk_stop (&hti);rhashtable_walk_exit (&hti); -schedule: + +return 1 ; +} + +void nf_flow_offload_work_gc (struct work_struct *work) +{ +struct nf_flowtable *flow_table; + + flow_table = container_of(work, struct nf_flowtable, gc_work.work); +nf_flow_offload_gc_step (flow_table);queue_delayed_work (system_power_efficient_wq, &flow_table->gc_work,HZ ); }EXPORT_SYMBOL_GPL (nf_flow_offload_work_gc);
@@ -449,5 +455,12 @@ void nf_flow_table_cleanup(struct net *net, struct net_device *dev) }EXPORT_SYMBOL_GPL (nf_flow_table_cleanup); +void nf_flow_table_free (struct nf_flowtable *flow_table) +{ +nf_flow_table_iterate (flow_table, nf_flow_table_do_cleanup,NULL ); +WARN_ON (!nf_flow_offload_gc_step (flow_table)); +} +EXPORT_SYMBOL_GPL (nf_flow_table_free); +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Pablo Neira Ayuso <[email protected]>" );
net/netfilter/nf_flow_table_inet.c +1 -0
@@ -24,6 +24,7 @@ static struct nf_flowtable_type flowtable_inet = { .family = NFPROTO_INET, .params = &nf_flow_offload_rhash_params, .gc = nf_flow_offload_work_gc, + .free = nf_flow_table_free, .hook = nf_flow_offload_inet_hook, .owner = THIS_MODULE, };
net/netfilter/nf_tables_api.c +2 -7
@@ -5399,17 +5399,12 @@ static void nf_tables_flowtable_notify(struct nft_ctx *ctx,nfnetlink_set_err (ctx->net, ctx->portid,NFNLGRP_NFTABLES , -ENOBUFS ); } -static void nft_flowtable_destroy (void *ptr,void *arg) -{ -kfree (ptr); -} -static void nf_tables_flowtable_destroy (struct nft_flowtable *flowtable) {cancel_delayed_work_sync (&flowtable->data.gc_work);kfree (flowtable->name); -rhashtable_free_and_destroy (&flowtable->data.rhashtable, - nft_flowtable_destroy,NULL ); + flowtable->data.type->free (&flowtable->data); +rhashtable_destroy (&flowtable->data.rhashtable);module_put (flowtable->data.type->owner); }
Signature · 1 line
2.11.0