dynamic device updates for flowtables
Subsystems (2)
Pablo Neira Ayuso
maintainercover dynamic device updates for flowtables
Hi,
Flowtable allows you to enable a fast forwarding path (packets bypass the classic forwarding path), eg.
table inet filter {
flowtable fastpath {
hook ingress priority 0
devices = { eth0, eth1 }
}
chain forward {
type filter hook forward priority 0; policy accept;
ip protocol { tcp , udp } flow offload @fastpath;
}
}This ruleset above places TCP and UDP flows in the "fastpath" flowtable. Flowtables integrate nicely with NAT and lightweight tunnels.
This patchset implements dynamic device updates for flowtables:
Patch #1 generalises the flowtable hook parser to take a hook list. Patch #2 passes a hook list to the flowtable hook registration/unregistration. Patch #3 adds a helper function to release the flowtable hook list. Patch #4 updates the flowtable event notifier to pass a flowtable hook list. Patch #5 allows users to add new devices to an existing flowtables. Patch #6 allows users to remove devices to an existing flowtables. Patch #7 allows to register a flowtable with no initial devices.
This allows users to register a flowtable with no devices:
nft add flowtable x y { hook ingress priority 0\; }then, add dynamic devices as they show up:
nft add flowtable x y { devices = { ppp0, eth1 } \; }Devices that go away are automagically removed from the flowtable.
Pablo Neira Ayuso (7):
netfilter: nf_tables: generalise flowtable hook parsing
netfilter: nf_tables: pass hook list to nft_{un,}register_flowtable_net_hooks()
netfilter: nf_tables: add nft_flowtable_hooks_destroy()
netfilter: nf_tables: pass hook list to flowtable event notifier
netfilter: nf_tables: add devices to existing flowtable
netfilter: nf_tables: delete devices from flowtable
netfilter: nf_tables: allow to register flowtable with no devices
include/net/netfilter/nf_tables.h | 7 + net/netfilter/nf_tables_api.c | 304 ++++++++++++++++++++++++------ 2 files changed, 253 insertions(+), 58 deletions(-)
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 1/7 netfilter: nf_tables: generalise flowtable hook parsing
Update nft_flowtable_parse_hook() to take the flowtable hook list as parameter. This allows to reuse this function to update the hooks.
--- net/netfilter/nf_tables_api.c | 36 ++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-)
net/netfilter/nf_tables_api.c +25 -11
@@ -6178,21 +6178,30 @@ nft_flowtable_lookup_byhandle(const struct nft_table *table,return ERR_PTR (-ENOENT ); } +struct nft_flowtable_hook { +u32 num; +int priority; +struct list_head list; +}; +static const struct nla_policy nft_flowtable_hook_policy[NFTA_FLOWTABLE_HOOK_MAX +1 ] = { [NFTA_FLOWTABLE_HOOK_NUM ] = { .type =NLA_U32 }, [NFTA_FLOWTABLE_HOOK_PRIORITY ] = { .type =NLA_U32 }, [NFTA_FLOWTABLE_HOOK_DEVS ] = { .type =NLA_NESTED }, }; -static int nf_tables_flowtable_parse_hook (const struct nft_ctx *ctx, -const struct nlattr *attr, -struct nft_flowtable *flowtable) +static int nft_flowtable_parse_hook (const struct nft_ctx *ctx, +const struct nlattr *attr, +struct nft_flowtable_hook *flowtable_hook, +struct nf_flowtable *ft) {struct nlattr *tb[NFTA_FLOWTABLE_HOOK_MAX +1 ];struct nft_hook *hook;int hooknum, priority;int err; +INIT_LIST_HEAD (&flowtable_hook->list); + err =nla_parse_nested_deprecated (tb,NFTA_FLOWTABLE_HOOK_MAX , attr, nft_flowtable_hook_policy,NULL );if (err <0 )
@@ -6211,19 +6220,19 @@ static int nf_tables_flowtable_parse_hook(const struct nft_ctx *ctx, err =nf_tables_parse_netdev_hooks (ctx->net, tb[NFTA_FLOWTABLE_HOOK_DEVS ], - &flowtable->hook_list); + &flowtable_hook->list);if (err <0 )return err; - flowtable->hooknum = hooknum; - flowtable->data.priority = priority; + flowtable_hook->priority = priority; + flowtable_hook->num = hooknum; -list_for_each_entry (hook, &flowtable->hook_list, list) { +list_for_each_entry (hook, &flowtable_hook->list, list) { hook->ops.pf =NFPROTO_NETDEV ; hook->ops.hooknum = hooknum; hook->ops.priority = priority; - hook->ops.priv = &flowtable->data; - hook->ops.hook = flowtable->data.type->hook; + hook->ops.priv = ft; + hook->ops.hook = ft->type->hook; }return err;
@@ -6336,6 +6345,7 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk, struct netlink_ext_ack *extack) {const struct nfgenmsg *nfmsg =nlmsg_data (nlh); +struct nft_flowtable_hook flowtable_hook;const struct nf_flowtable_type *type;u8 genmask =nft_genmask_next (net);int family = nfmsg->nfgen_family;
@@ -6409,11 +6419,15 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk,if (err <0 ) goto err3; - err =nf_tables_flowtable_parse_hook (&ctx, nla[NFTA_FLOWTABLE_HOOK ], - flowtable); + err =nft_flowtable_parse_hook (&ctx, nla[NFTA_FLOWTABLE_HOOK ], + &flowtable_hook, &flowtable->data);if (err <0 ) goto err4; +list_splice (&flowtable_hook.list, &flowtable->hook_list); + flowtable->data.priority = flowtable_hook.priority; + flowtable->hooknum = flowtable_hook.num; + err =nft_register_flowtable_net_hooks (ctx.net, table, flowtable);if (err <0 ) {list_for_each_entry_safe (hook, next, &flowtable->hook_list, list) {
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 2/7 netfilter: nf_tables: pass hook list to nft_{un,}register_flowtable_net_hooks()
In reply to Pablo Neira AyusoThis patch prepares for incremental flowtable hook updates.
--- net/netfilter/nf_tables_api.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_api.c +10 -7
@@ -6279,23 +6279,24 @@ static void nft_unregister_flowtable_hook(struct net *net, }static void nft_unregister_flowtable_net_hooks (struct net *net, -struct nft_flowtable *flowtable) +struct list_head *hook_list) {struct nft_hook *hook; -list_for_each_entry (hook, &flowtable->hook_list, list) +list_for_each_entry (hook, hook_list, list)nf_unregister_net_hook (net, &hook->ops); }static int nft_register_flowtable_net_hooks (struct net *net,struct nft_table *table, +struct list_head *hook_list,struct nft_flowtable *flowtable) {struct nft_hook *hook, *hook2, *next;struct nft_flowtable *ft;int err, i =0 ; -list_for_each_entry (hook, &flowtable->hook_list, list) { +list_for_each_entry (hook, hook_list, list) {list_for_each_entry (ft, &table->flowtables, list) {list_for_each_entry (hook2, &ft->hook_list, list) { if (hook->ops.dev == hook2->ops.dev &&
@@ -6326,7 +6327,7 @@ static int nft_register_flowtable_net_hooks(struct net *net,return 0 ; err_unregister_net_hooks: -list_for_each_entry_safe (hook, next, &flowtable->hook_list, list) { +list_for_each_entry_safe (hook, next, hook_list, list) {if (i-- <=0 )break ;
@@ -6428,7 +6429,9 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk, flowtable->data.priority = flowtable_hook.priority; flowtable->hooknum = flowtable_hook.num; - err =nft_register_flowtable_net_hooks (ctx.net, table, flowtable); + err =nft_register_flowtable_net_hooks (ctx.net, table, + &flowtable->hook_list, + flowtable);if (err <0 ) {list_for_each_entry_safe (hook, next, &flowtable->hook_list, list) {list_del_rcu (&hook->list);
@@ -7493,7 +7496,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)nft_trans_flowtable (trans), NFT_MSG_DELFLOWTABLE);nft_unregister_flowtable_net_hooks (net, -nft_trans_flowtable (trans)); + &nft_trans_flowtable (trans)->hook_list);break ; } }
@@ -7652,7 +7655,7 @@ static int __nf_tables_abort(struct net *net, bool autoload) trans->ctx.table->use--;list_del_rcu (&nft_trans_flowtable (trans)->list);nft_unregister_flowtable_net_hooks (net, -nft_trans_flowtable (trans)); + &nft_trans_flowtable (trans)->hook_list);break ;case NFT_MSG_DELFLOWTABLE : trans->ctx.table->use++;
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 3/7 netfilter: nf_tables: add nft_flowtable_hooks_destroy()
In reply to Pablo Neira AyusoThis patch adds a helper function destroy the flowtable hooks.
--- net/netfilter/nf_tables_api.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
net/netfilter/nf_tables_api.c +11 -4
@@ -6339,6 +6339,16 @@ static int nft_register_flowtable_net_hooks(struct net *net,return err; } +static void nft_flowtable_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); +kfree_rcu (hook, rcu); + } +} + static int nf_tables_newflowtable(struct net *net, struct sock *nlsk, struct sk_buff *skb, const struct nlmsghdr *nlh,
@@ -6433,10 +6443,7 @@ static int nf_tables_newflowtable(struct net *net, struct sock *nlsk, &flowtable->hook_list, flowtable);if (err <0 ) { -list_for_each_entry_safe (hook, next, &flowtable->hook_list, list) { -list_del_rcu (&hook->list); -kfree_rcu (hook, rcu); - } +nft_flowtable_hooks_destroy (&flowtable->hook_list); goto err4; }
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 4/7 netfilter: nf_tables: pass hook list to flowtable event notifier
In reply to Pablo Neira AyusoUpdate the flowtable netlink notifier to take the list of hooks as input. This allows to reuse this function in incremental flowtable hook updates.
--- net/netfilter/nf_tables_api.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +11 -5
@@ -6523,7 +6523,8 @@ static int nf_tables_delflowtable(struct net *net, struct sock *nlsk,static int nf_tables_fill_flowtable_info (struct sk_buff *skb,struct net *net,u32 portid,u32 seq,int event,u32 flags,int family, -struct nft_flowtable *flowtable) +struct nft_flowtable *flowtable, +struct list_head *hook_list) {struct nlattr *nest, *nest_devs;struct nfgenmsg *nfmsg;
@@ -6559,7 +6560,7 @@ static int nf_tables_fill_flowtable_info(struct sk_buff *skb, struct net *net,if (!nest_devs) goto nla_put_failure; -list_for_each_entry_rcu (hook, &flowtable->hook_list, list) { +list_for_each_entry_rcu (hook, hook_list, list) {if (nla_put_string (skb,NFTA_DEVICE_NAME , hook->ops.dev->name)) goto nla_put_failure; }
@@ -6612,7 +6613,9 @@ static int nf_tables_dump_flowtable(struct sk_buff *skb, cb->nlh->nlmsg_seq,NFT_MSG_NEWFLOWTABLE ,NLM_F_MULTI |NLM_F_APPEND , - table->family, flowtable) < 0) + table->family, + flowtable, + &flowtable->hook_list) < 0) goto done;nl_dump_check_consistent (cb,nlmsg_hdr (skb));
@@ -6709,7 +6712,7 @@ static int nf_tables_getflowtable(struct net *net, struct sock *nlsk, err =nf_tables_fill_flowtable_info (skb2, net,NETLINK_CB (skb).portid, nlh->nlmsg_seq,NFT_MSG_NEWFLOWTABLE ,0 , family, - flowtable); + flowtable, &flowtable->hook_list);if (err <0 ) goto err;
@@ -6721,6 +6724,7 @@ static int nf_tables_getflowtable(struct net *net, struct sock *nlsk,static void nf_tables_flowtable_notify (struct nft_ctx *ctx,struct nft_flowtable *flowtable, +struct list_head *hook_list,int event) {struct sk_buff *skb;
@@ -6736,7 +6740,7 @@ static void nf_tables_flowtable_notify(struct nft_ctx *ctx, err =nf_tables_fill_flowtable_info (skb, ctx->net, ctx->portid, ctx->seq, event,0 , - ctx->family, flowtable); + ctx->family, flowtable, hook_list);if (err <0 ) {kfree_skb (skb); goto err;
@@ -7494,6 +7498,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)nft_clear (net,nft_trans_flowtable (trans));nf_tables_flowtable_notify (&trans->ctx,nft_trans_flowtable (trans), + &nft_trans_flowtable (trans)->hook_list,NFT_MSG_NEWFLOWTABLE );nft_trans_destroy (trans);break ;
@@ -7501,6 +7506,7 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb)list_del_rcu (&nft_trans_flowtable (trans)->list);nf_tables_flowtable_notify (&trans->ctx,nft_trans_flowtable (trans), + &nft_trans_flowtable (trans)->hook_list,NFT_MSG_DELFLOWTABLE );nft_unregister_flowtable_net_hooks (net, &nft_trans_flowtable (trans)->hook_list);
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 5/7 netfilter: nf_tables: add devices to existing flowtable
In reply to Pablo Neira AyusoThis patch allows users to add devices to an existing flowtable.
--- include/net/netfilter/nf_tables.h | 6 ++ net/netfilter/nf_tables_api.c | 97 +++++++++++++++++++++++++++---- 2 files changed, 92 insertions(+), 11 deletions(-)
include/net/netfilter/nf_tables.h +6 -0
@@ -1481,10 +1481,16 @@ struct nft_trans_obj {struct nft_trans_flowtable {struct nft_flowtable *flowtable; +bool update; +struct list_head hook_list; };#define nft_trans_flowtable (trans) \ (((struct nft_trans_flowtable *)trans->data)->flowtable) +#define nft_trans_flowtable_update (trans) \ + (((struct nft_trans_flowtable *)trans->data)->update) +#define nft_trans_flowtable_hooks (trans) \ + (((struct nft_trans_flowtable *)trans->data)->hook_list)int __init nft_chain_filter_init (void );void nft_chain_filter_fini (void );
net/netfilter/nf_tables_api.c +86 -11
127 lines not on this page · raw message
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 6/7 netfilter: nf_tables: delete devices from flowtable
In reply to Pablo Neira AyusoThis patch allows users to delete devices from existing flowtables.
--- include/net/netfilter/nf_tables.h | 1 + net/netfilter/nf_tables_api.c | 113 +++++++++++++++++++++++++----- 2 files changed, 98 insertions(+), 16 deletions(-)
include/net/netfilter/nf_tables.h +1 -0
@@ -1002,6 +1002,7 @@ struct nft_stats {struct nft_hook {struct list_head list; +bool inactive;struct nf_hook_ops ops;struct rcu_head rcu; };
net/netfilter/nf_tables_api.c +97 -16
179 lines not on this page · raw message
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH 7/7 netfilter: nf_tables: allow to register flowtable with no devices
In reply to Pablo Neira AyusoA flowtable might be composed of dynamic interfaces only. Such dynamic interfaces might show up at a later stage. This patch allows users to register a flowtable with no devices. Once the dynamic interface becomes available, the user adds the dynamic devices to the flowtable.
--- net/netfilter/nf_tables_api.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
net/netfilter/nf_tables_api.c +11 -9
@@ -1724,8 +1724,6 @@ static int nf_tables_parse_netdev_hooks(struct net *net, goto err_hook; } } -if (!n) -return -EINVAL ;return 0 ;
@@ -1762,6 +1760,9 @@ static int nft_chain_parse_netdev(struct net *net, hook_list);if (err <0 )return err; + +if (list_empty (hook_list)) +return -EINVAL ; }else {return -EINVAL ; }
@@ -6209,8 +6210,7 @@ static int nft_flowtable_parse_hook(const struct nft_ctx *ctx,return err;if (!tb[NFTA_FLOWTABLE_HOOK_NUM ] || - !tb[NFTA_FLOWTABLE_HOOK_PRIORITY ] || - !tb[NFTA_FLOWTABLE_HOOK_DEVS ]) + !tb[NFTA_FLOWTABLE_HOOK_PRIORITY ])return -EINVAL ; hooknum =ntohl (nla_get_be32 (tb[NFTA_FLOWTABLE_HOOK_NUM ]));
@@ -6219,11 +6219,13 @@ static int nft_flowtable_parse_hook(const struct nft_ctx *ctx, priority =ntohl (nla_get_be32 (tb[NFTA_FLOWTABLE_HOOK_PRIORITY ])); - err =nf_tables_parse_netdev_hooks (ctx->net, - tb[NFTA_FLOWTABLE_HOOK_DEVS ], - &flowtable_hook->list); -if (err <0 ) -return err; +if (tb[NFTA_FLOWTABLE_HOOK_DEVS ]) { + err =nf_tables_parse_netdev_hooks (ctx->net, + tb[NFTA_FLOWTABLE_HOOK_DEVS ], + &flowtable_hook->list); +if (err <0 ) +return err; + } flowtable_hook->priority = priority; flowtable_hook->num = hooknum;
Signature · 1 line
2.20.1