netfilter: add and use nf_hook_slow_list()
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: add and use nf_hook_slow_list()
At this time, NF_HOOK_LIST() macro will iterate the list and then call nf_hook() for each skb.
This makes it so the entire list is passed into the netfilter core. The advantage is that we only need to fetch the rule blob once per list instead of per-skb. If no rules are present, the list operations can be elided entirely.
NF_HOOK_LIST only supports ipv4 and ipv6, but those are the only callers.
--- include/linux/netfilter.h | 41 +++++++++++++++++++++++++++++---------- net/netfilter/core.c | 20 +++++++++++++++++++ 2 files changed, 51 insertions(+), 10 deletions(-)
include/linux/netfilter.h +31 -10
@@ -199,6 +199,8 @@ extern struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS];int nf_hook_slow (struct sk_buff *skb,struct nf_hook_state *state,const struct nf_hook_entries *e,unsigned int i); +void nf_hook_slow_list (struct list_head *head,struct nf_hook_state *state, +const struct nf_hook_entries *e);/** * nf_hook - call a netfilter hook *
@@ -311,17 +313,36 @@ NF_HOOK_LIST(uint8_t pf, unsigned int hook, struct net *net, struct sock *sk, struct list_head *head, struct net_device *in, struct net_device *out, int (*okfn)(struct net *, struct sock *, struct sk_buff *)) { - struct sk_buff *skb, *next; -struct list_head sublist; - -INIT_LIST_HEAD (&sublist); -list_for_each_entry_safe (skb, next, head, list) { -list_del (&skb->list); -if (nf_hook (pf, hook, net, sk, skb, in, out, okfn) ==1 ) -list_add_tail (&skb->list, &sublist); + struct nf_hook_entries *hook_head = NULL; + +#ifdef CONFIG_JUMP_LABEL +if (__builtin_constant_p (pf) && +__builtin_constant_p (hook) && + !static_key_false (&nf_hooks_needed[pf][hook])) +return ; +#endif + +rcu_read_lock (); +switch (pf) { +case NFPROTO_IPV4 : + hook_head =rcu_dereference (net->nf.hooks_ipv4[hook]); +break ; +case NFPROTO_IPV6 : + hook_head =rcu_dereference (net->nf.hooks_ipv6[hook]); +break ; +default : +WARN_ON_ONCE (1 ); +break ; } -/* Put passed packets back on main list */ -list_splice (&sublist, head); + +if (hook_head) { +struct nf_hook_state state; + +nf_hook_state_init (&state, hook, pf, in, out, sk, net, okfn); + +nf_hook_slow_list (head, &state, hook_head); + } +rcu_read_unlock (); }/* Call setsockopt() */
net/netfilter/core.c +20 -0
@@ -536,6 +536,26 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, }EXPORT_SYMBOL (nf_hook_slow); +void nf_hook_slow_list (struct list_head *head,struct nf_hook_state *state, +const struct nf_hook_entries *e) +{ +struct sk_buff *skb, *next; +struct list_head sublist; +int ret; + +INIT_LIST_HEAD (&sublist); + +list_for_each_entry_safe (skb, next, head, list) { +list_del (&skb->list); + ret =nf_hook_slow (skb, state, e,0 ); +if (ret ==1 ) +list_add_tail (&skb->list, &sublist); + } +/* Put passed packets back on main list */ +list_splice (&sublist, head); +} +EXPORT_SYMBOL (nf_hook_slow_list); +/* This needs to be compiled in any case to avoid dependencies between the * nfnetlink_queue code and nf_conntrack. */
Signature · 1 line
2.21.0
Quoted 8 lines · Florian Westphal
At this time,
NF_HOOK_LIST()macro will iterate the list and then callnf_hook()for each skb.This makes it so the entire list is passed into the netfilter core. The advantage is that we only need to fetch the rule blob once per list instead of per-skb. If no rules are present, the list operations can be elided entirely.
Quoted 6 lines
NF_HOOK_LISTonly supports ipv4 and ipv6, but those are the only callers.Cc Edward Cree <[email protected]>Signed-off-by Florian Westphal <[email protected]>---
LGTM (but see below).
Quoted 73 lines
include/linux/netfilter.h | 41 +++++++++++++++++++++++++++++---------- net/netfilter/core.c | 20 +++++++++++++++++++ 2 files changed, 51 insertions(+), 10 deletions(-)include/linux/netfilter.h +31
-10@@ -199,6 +199,8 @@ extern struct static_key nf_hooks_needed[NFPROTO_NUMPROTO][NF_MAX_HOOKS];int nf_hook_slow (struct sk_buff *skb,struct nf_hook_state *state,const struct nf_hook_entries *e,unsigned int i); +void nf_hook_slow_list (struct list_head *head,struct nf_hook_state *state, +const struct nf_hook_entries *e);/** * nf_hook - call a netfilter hook * @@ -311,17 +313,36 @@ NF_HOOK_LIST(uint8_t pf, unsigned int hook, struct net *net, struct sock *sk, struct list_head *head, struct net_device *in, struct net_device *out, int (*okfn)(struct net *, struct sock *, struct sk_buff *)) { - struct sk_buff *skb, *next; -struct list_head sublist; - -INIT_LIST_HEAD (&sublist); -list_for_each_entry_safe (skb, next, head, list) { -list_del (&skb->list); -if (nf_hook (pf, hook, net, sk, skb, in, out, okfn) ==1 ) -list_add_tail (&skb->list, &sublist); + struct nf_hook_entries *hook_head = NULL; + +#ifdef CONFIG_JUMP_LABEL +if (__builtin_constant_p (pf) && +__builtin_constant_p (hook) && + !static_key_false (&nf_hooks_needed[pf][hook])) +return ; +#endif + +rcu_read_lock (); +switch (pf) { +case NFPROTO_IPV4 : + hook_head =rcu_dereference (net->nf.hooks_ipv4[hook]); +break ; +case NFPROTO_IPV6 : + hook_head =rcu_dereference (net->nf.hooks_ipv6[hook]); +break ; +default : +WARN_ON_ONCE (1 ); +break ; } -/* Put passed packets back on main list */ -list_splice (&sublist, head); + +if (hook_head) { +struct nf_hook_state state; + +nf_hook_state_init (&state, hook, pf, in, out, sk, net, okfn); + +nf_hook_slow_list (head, &state, hook_head); + } +rcu_read_unlock (); }/* Call setsockopt() */ net/netfilter/core.c +1
-0@@ -536,6 +536,26 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, }EXPORT_SYMBOL (nf_hook_slow); +void nf_hook_slow_list(struct list_head *head, struct nf_hook_state *state,
net/netfilter/core.c int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, · line 549
Quoted 10 lines
net/netfilter/core.c +10
-0+ const struct nf_hook_entries *e) +{ +struct sk_buff *skb, *next; +struct list_head sublist; +int ret; + +INIT_LIST_HEAD (&sublist); + +list_for_each_entry_safe (skb, next, head, list) { +list_del (&skb->list);
I know this was just copied from the existing code, but I've been getting
a lot more paranoid lately about skbs escaping with non-NULL ->next pointers, since several bugs of that kind have turned up elsewhere.
So should this maybe be skb_list_del_init()?
-Ed
net/netfilter/core.c int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, · line 561
Quoted 12 lines
net/netfilter/core.c +9
-0+ ret =nf_hook_slow (skb, state, e,0 ); +if (ret ==1 ) +list_add_tail (&skb->list, &sublist); + } +/* Put passed packets back on main list */ +list_splice (&sublist, head); +} +EXPORT_SYMBOL (nf_hook_slow_list); +/* This needs to be compiled in any case to avoid dependencies between the * nfnetlink_queue code and nf_conntrack. */
The information contained in this message is confidential and is intended for the addressee(s) only. If you have received this message in error, please notify the sender immediately and delete the message. Unless you are an addressee (or authorized to receive for an addressee), you may not use, copy or disclose to anyone this message or any information contained in this message. The unauthorized use, disclosure, copying or alteration of this message is strictly prohibited.
Florian Westphal
maintainerQuoted 17 lines · Edward Cree
Quoted 8 lines · Florian Westphal
At this time,
NF_HOOK_LIST()macro will iterate the list and then callnf_hook()for each skb.This makes it so the entire list is passed into the netfilter core. The advantage is that we only need to fetch the rule blob once per list instead of per-skb. If no rules are present, the list operations can be elided entirely.
Quoted 6 lines
NF_HOOK_LISTonly supports ipv4 and ipv6, but those are the only callers.Cc Edward Cree <[email protected]>Signed-off-by Florian Westphal <[email protected]>---
LGTM (but see below).
Acked-by Edward Cree <[email protected]>
[..]
Quoted 6 lines
net/netfilter/core.c int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state, · line 549
Quoted 2 lines
net/netfilter/core.c +2
-0+list_for_each_entry_safe (skb, next, head, list) { +list_del (&skb->list);I know this was just copied from the existing code, but I've been getting a lot more paranoid lately about skbs escaping with non-NULL ->next pointers, since several bugs of that kind have turned up elsewhere. So should this maybe be
skb_list_del_init()?
Ok, I can make that change and send a v2.