netfilter: ecache: simplify event registration
Subsystems (2)
Florian Westphal
maintainercover netfilter: ecache: simplify event registration
This patchset simplifies event registration handling.
Event and expectation handler registration is merged into one. This reduces boilerplate code during netns register/unregister.
Also, there is only one implementation of the event handler (ctnetlink), so it makes no sense to return -EBUSY if another handler is registered already -- it cannot happen.
This also allows to remove the 'nf_exp_event_notifier' pointer from struct net.
Florian Westphal (5):
netfilter: ecache: remove one indent level
netfilter: ecache: remove another indent level
netfilter: ecache: add common helper for nf_conntrack_eventmask_report
netfilter: ecache: prepare for event notifier merge
netfilter: ecache: remove nf_exp_event_notifier structure
include/net/netfilter/nf_conntrack_ecache.h | 32 +-- include/net/netns/conntrack.h | 1 - net/netfilter/nf_conntrack_ecache.c | 211 +++++++------------- net/netfilter/nf_conntrack_netlink.c | 50 +---- 4 files changed, 96 insertions(+), 198 deletions(-)
Signature · 1 line
2.31.1
Florian Westphal
maintainerPATCH 1/5 netfilter: ecache: remove one indent level
nf_conntrack_eventmask_report and nf_ct_deliver_cached_events shared most of their code. This unifies the layout by changing
if (nf_ct_is_confirmed(ct)) {
foo
}
to
if (!nf_ct_is_confirmed(ct)))
return
foo
This removes one level of indentation.
--- include/net/netfilter/nf_conntrack_ecache.h | 2 +- net/netfilter/nf_conntrack_ecache.c | 64 +++++++++++---------- net/netfilter/nf_conntrack_netlink.c | 2 +- 3 files changed, 36 insertions(+), 32 deletions(-)
include/net/netfilter/nf_conntrack_ecache.h +1 -1
@@ -73,7 +73,7 @@ struct nf_ct_event { };struct nf_ct_event_notifier { -int (*fcn)(unsigned int events,struct nf_ct_event *item); +int (*fcn)(unsigned int events,const struct nf_ct_event *item); }; int nf_conntrack_register_notifier(struct net *net,
net/netfilter/nf_conntrack_ecache.c +34 -30
82 lines not on this page · raw message
net/netfilter/nf_conntrack_netlink.c +1 -1
@@ -706,7 +706,7 @@ static size_t ctnetlink_nlmsg_size(const struct nf_conn *ct) }static int -ctnetlink_conntrack_event (unsigned int events,struct nf_ct_event *item) +ctnetlink_conntrack_event (unsigned int events,const struct nf_ct_event *item) {const struct nf_conntrack_zone *zone;struct net *net;
Signature · 1 line
2.31.1
Florian Westphal
maintainerPATCH 2/5 netfilter: ecache: remove another indent level
In reply to Florian Westphal... by changing:
if (unlikely(ret < 0 || missed)) {
if (ret < 0) {
to
if (likely(ret >= 0 && !missed))
goto out;if (ret < 0) {
After this nf_conntrack_eventmask_report and nf_ct_deliver_cached_events look pretty much the same, next patch moves common code to a helper.
This patch has no effect on generated code.
--- net/netfilter/nf_conntrack_ecache.c | 34 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-)
net/netfilter/nf_conntrack_ecache.c +18 -16
@@ -165,25 +165,27 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct, goto out_unlock; ret = notify->fcn (eventmask | missed, &item); -if (unlikely (ret <0 || missed)) { -spin_lock_bh (&ct->lock); -if (ret <0 ) { -/* This is a destroy event that has been -* triggered by a process, we store the PORTID -* to include it in the retransmission. -*/ -if (eventmask & (1 <<IPCT_DESTROY )) { -if (e->portid ==0 && portid !=0 ) - e->portid = portid; - e->state =NFCT_ECACHE_DESTROY_FAIL ; - }else { - e->missed |= eventmask; - } +if (likely (ret >=0 && !missed)) + goto out_unlock; + +spin_lock_bh (&ct->lock); +if (ret <0 ) { +/* This is a destroy event that has been +* triggered by a process, we store the PORTID +* to include it in the retransmission. +*/ +if (eventmask & (1 <<IPCT_DESTROY )) { +if (e->portid ==0 && portid !=0 ) + e->portid = portid; + e->state =NFCT_ECACHE_DESTROY_FAIL ; }else { - e->missed &= ~missed; + e->missed |= eventmask; } -spin_unlock_bh (&ct->lock); + }else { + e->missed &= ~missed; } +spin_unlock_bh (&ct->lock); + out_unlock:rcu_read_unlock ();return ret;
Signature · 1 line
2.31.1
Florian Westphal
maintainerPATCH 3/5 netfilter: ecache: add common helper for nf_conntrack_eventmask_report
In reply to Florian Westphalnf_ct_deliver_cached_events and nf_conntrack_eventmask_report are very similar. Split nf_conntrack_eventmask_report into a common helper function that can be used for both cases.
--- net/netfilter/nf_conntrack_ecache.c | 124 +++++++++++++--------------- 1 file changed, 56 insertions(+), 68 deletions(-)
net/netfilter/nf_conntrack_ecache.c +56 -68
@@ -130,27 +130,57 @@ static void ecache_work(struct work_struct *work)schedule_delayed_work (&cnet->ecache_dwork, delay); } -int nf_conntrack_eventmask_report (unsigned int eventmask,struct nf_conn *ct, -u32 portid,int report) +static int __nf_conntrack_eventmask_report (struct nf_conntrack_ecache *e, +const unsigned int events, +const unsigned long missed, +const struct nf_ct_event *item) { -struct net *net =nf_ct_net (ct); +struct nf_conn *ct = item->ct; +struct net *net =nf_ct_net (item->ct);struct nf_ct_event_notifier *notify; +int ret; + +if (!((events | missed) & e->ctmask)) +return 0 ; + +rcu_read_lock (); + + notify =rcu_dereference (net->ct.nf_conntrack_event_cb); +if (!notify) { +rcu_read_unlock (); +return 0 ; + } + + ret = notify->fcn (events | missed, item); +rcu_read_unlock (); + +if (likely (ret >=0 && missed ==0 )) +return 0 ; + +spin_lock_bh (&ct->lock); +if (ret <0 ) + e->missed |= events; +else + e->missed &= ~missed; +spin_unlock_bh (&ct->lock); + +return ret; +} + +int nf_conntrack_eventmask_report (unsigned int events,struct nf_conn *ct, +u32 portid,int report) +{struct nf_conntrack_ecache *e;struct nf_ct_event item;unsigned long missed; -int ret =0 ; +int ret;if (!nf_ct_is_confirmed (ct)) -return ret; - -rcu_read_lock (); - notify =rcu_dereference (net->ct.nf_conntrack_event_cb); -if (!notify) - goto out_unlock; +return 0 ; e =nf_ct_ecache_find (ct);if (!e) - goto out_unlock; +return 0 ;memset (&item,0 ,sizeof (item));
@@ -161,33 +191,16 @@ int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,/* This is a resent of a destroy event? If so, skip missed */ missed = e->portid ?0 : e->missed; -if (!((eventmask | missed) & e->ctmask)) - goto out_unlock; - - ret = notify->fcn (eventmask | missed, &item); -if (likely (ret >=0 && !missed)) - goto out_unlock; - -spin_lock_bh (&ct->lock); -if (ret <0 ) { -/* This is a destroy event that has been -* triggered by a process, we store the PORTID -* to include it in the retransmission. + ret =__nf_conntrack_eventmask_report (e, events, missed, &item); +if (unlikely (ret <0 && (events & (1 <<IPCT_DESTROY )))) { +/* This is a destroy event that has been triggered by a process, +* we store the PORTID to include it in the retransmission. */ -if (eventmask & (1 <<IPCT_DESTROY )) { -if (e->portid ==0 && portid !=0 ) - e->portid = portid; - e->state =NFCT_ECACHE_DESTROY_FAIL ; - }else { - e->missed |= eventmask; - } - }else { - e->missed &= ~missed; +if (e->portid ==0 && portid !=0 ) + e->portid = portid; + e->state =NFCT_ECACHE_DESTROY_FAIL ; } -spin_unlock_bh (&ct->lock); -out_unlock: -rcu_read_unlock ();return ret; }EXPORT_SYMBOL_GPL (nf_conntrack_eventmask_report);
@@ -196,53 +209,28 @@ EXPORT_SYMBOL_GPL(nf_conntrack_eventmask_report);* disabled softirqs */ void nf_ct_deliver_cached_events (struct nf_conn *ct) { -struct net *net =nf_ct_net (ct); -unsigned long events, missed; -struct nf_ct_event_notifier *notify;struct nf_conntrack_ecache *e;struct nf_ct_event item; -int ret; - -rcu_read_lock (); - notify =rcu_dereference (net->ct.nf_conntrack_event_cb); -if (notify ==NULL ) - goto out_unlock; +unsigned long events;if (!nf_ct_is_confirmed (ct) ||nf_ct_is_dying (ct)) - goto out_unlock; +return ; e =nf_ct_ecache_find (ct);if (e ==NULL ) - goto out_unlock; +return ; events =xchg (&e->cache,0 ); -/* We make a copy of the missed event cache without taking -* the lock, thus we may send missed events twice. However, -* this does not harm and it happens very rarely. */ - missed = e->missed; - -if (!((events | missed) & e->ctmask)) - goto out_unlock; - item.ct = ct; item.portid =0 ; item.report =0 ; - ret = notify->fcn (events | missed, &item); - -if (likely (ret ==0 && !missed)) - goto out_unlock; - -spin_lock_bh (&ct->lock); -if (ret <0 ) - e->missed |= events; -else - e->missed &= ~missed; -spin_unlock_bh (&ct->lock); - -out_unlock: -rcu_read_unlock (); +/* We make a copy of the missed event cache without taking +* the lock, thus we may send missed events twice. However, +* this does not harm and it happens very rarely. +*/ +__nf_conntrack_eventmask_report (e, events, e->missed, &item); }EXPORT_SYMBOL_GPL (nf_ct_deliver_cached_events);
Signature · 1 line
2.31.1
Florian Westphal
maintainerPATCH 4/5 netfilter: ecache: prepare for event notifier merge
In reply to Florian WestphalThis prepares for merge for ct and exp notifier structs.
The 'fcn' member is renamed to something unique. Second, the register/unregister api is simplified. There is only one implementation so there is no need to do any error checking.
Replace the EBUSY logic with WARN_ON_ONCE. This allows to remove error unwinding.
The exp notifier register/unregister function is removed in a followup patch.
--- include/net/netfilter/nf_conntrack_ecache.h | 11 ++++----- net/netfilter/nf_conntrack_ecache.c | 26 +++++---------------- net/netfilter/nf_conntrack_netlink.c | 22 +++++------------ 3 files changed, 17 insertions(+), 42 deletions(-)
include/net/netfilter/nf_conntrack_ecache.h +5 -6
@@ -73,13 +73,12 @@ struct nf_ct_event { };struct nf_ct_event_notifier { -int (*fcn)(unsigned int events,const struct nf_ct_event *item); +int (*ct_event)(unsigned int events,const struct nf_ct_event *item); }; -int nf_conntrack_register_notifier (struct net *net, -struct nf_ct_event_notifier *nb); -void nf_conntrack_unregister_notifier (struct net *net, -struct nf_ct_event_notifier *nb); +void nf_conntrack_register_notifier (struct net *net, +const struct nf_ct_event_notifier *nb); +void nf_conntrack_unregister_notifier (struct net *net);void nf_ct_deliver_cached_events (struct nf_conn *ct); int nf_conntrack_eventmask_report(unsigned int eventmask, struct nf_conn *ct,
@@ -159,7 +158,7 @@ struct nf_exp_event { };struct nf_exp_event_notifier { -int (*fcn)(unsigned int events,struct nf_exp_event *item); +int (*exp_event)(unsigned int events,struct nf_exp_event *item); }; int nf_ct_expect_register_notifier(struct net *net,
net/netfilter/nf_conntrack_ecache.c +6 -20
@@ -151,7 +151,7 @@ static int __nf_conntrack_eventmask_report(struct nf_conntrack_ecache *e,return 0 ; } - ret = notify->fcn (events | missed, item); + ret = notify->ct_event (events | missed, item);rcu_read_unlock ();if (likely (ret >=0 && missed ==0 ))
@@ -258,43 +258,29 @@ void nf_ct_expect_event_report(enum ip_conntrack_expect_events event, .portid = portid, .report = report }; - notify->fcn (1 << event, &item); + notify->exp_event (1 << event, &item); } out_unlock:rcu_read_unlock (); } -int nf_conntrack_register_notifier (struct net *net, -struct nf_ct_event_notifier *new) +void nf_conntrack_register_notifier (struct net *net, +const struct nf_ct_event_notifier *new) { -int ret;struct nf_ct_event_notifier *notify;mutex_lock (&nf_ct_ecache_mutex); notify =rcu_dereference_protected (net->ct.nf_conntrack_event_cb,lockdep_is_held (&nf_ct_ecache_mutex)); -if (notify !=NULL ) { - ret = -EBUSY ; - goto out_unlock; - } +WARN_ON_ONCE (notify);rcu_assign_pointer (net->ct.nf_conntrack_event_cb, new); - ret =0 ; - -out_unlock:mutex_unlock (&nf_ct_ecache_mutex); -return ret; }EXPORT_SYMBOL_GPL (nf_conntrack_register_notifier); -void nf_conntrack_unregister_notifier (struct net *net, -struct nf_ct_event_notifier *new) +void nf_conntrack_unregister_notifier (struct net *net) { -struct nf_ct_event_notifier *notify; -mutex_lock (&nf_ct_ecache_mutex); - notify =rcu_dereference_protected (net->ct.nf_conntrack_event_cb, -lockdep_is_held (&nf_ct_ecache_mutex)); -BUG_ON (notify != new);RCU_INIT_POINTER (net->ct.nf_conntrack_event_cb,NULL );mutex_unlock (&nf_ct_ecache_mutex);/* synchronize_rcu() is called from ctnetlink_exit. */
net/netfilter/nf_conntrack_netlink.c +6 -16
@@ -3755,11 +3755,11 @@ static int ctnetlink_stat_exp_cpu(struct sk_buff *skb,#ifdef CONFIG_NF_CONNTRACK_EVENTS static struct nf_ct_event_notifier ctnl_notifier = { - .fcn = ctnetlink_conntrack_event, + .ct_event = ctnetlink_conntrack_event, };static struct nf_exp_event_notifier ctnl_notifier_exp = { - .fcn = ctnetlink_expect_event, + .exp_event = ctnetlink_expect_event, };#endif
@@ -3854,33 +3854,23 @@ static int __net_init ctnetlink_net_init(struct net *net)#ifdef CONFIG_NF_CONNTRACK_EVENTS int ret; - ret =nf_conntrack_register_notifier (net, &ctnl_notifier); -if (ret <0 ) { -pr_err ("ctnetlink_init: cannot register notifier.\n" ); - goto err_out; - } +nf_conntrack_register_notifier (net, &ctnl_notifier); ret =nf_ct_expect_register_notifier (net, &ctnl_notifier_exp);if (ret <0 ) {pr_err ("ctnetlink_init: cannot expect register notifier.\n" ); - goto err_unreg_notifier; +nf_conntrack_unregister_notifier (net); +return ret; }#endif return 0 ; - -#ifdef CONFIG_NF_CONNTRACK_EVENTS -err_unreg_notifier: -nf_conntrack_unregister_notifier (net, &ctnl_notifier); -err_out: -return ret; -#endif }static void ctnetlink_net_exit (struct net *net) {#ifdef CONFIG_NF_CONNTRACK_EVENTS nf_ct_expect_unregister_notifier (net, &ctnl_notifier_exp); -nf_conntrack_unregister_notifier (net, &ctnl_notifier); +nf_conntrack_unregister_notifier (net);#endif }
Signature · 1 line
2.31.1
Florian Westphal
maintainerPATCH 5/5 netfilter: ecache: remove nf_exp_event_notifier structure
In reply to Florian WestphalReuse the conntrack event notofier struct, this allows to remove the extra register/unregister functions and avoids a pointer in struct net.
--- include/net/netfilter/nf_conntrack_ecache.h | 23 ++++------- include/net/netns/conntrack.h | 1 - net/netfilter/nf_conntrack_ecache.c | 43 ++------------------- net/netfilter/nf_conntrack_netlink.c | 30 ++------------ 4 files changed, 13 insertions(+), 84 deletions(-)
include/net/netfilter/nf_conntrack_ecache.h +7 -16
@@ -72,8 +72,15 @@ struct nf_ct_event {int report; }; +struct nf_exp_event { +struct nf_conntrack_expect *exp; +u32 portid; +int report; +}; +struct nf_ct_event_notifier {int (*ct_event)(unsigned int events,const struct nf_ct_event *item); +int (*exp_event)(unsigned int events,const struct nf_exp_event *item); }; void nf_conntrack_register_notifier(struct net *net,
@@ -150,22 +157,6 @@ nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct) }#ifdef CONFIG_NF_CONNTRACK_EVENTS - -struct nf_exp_event { -struct nf_conntrack_expect *exp; -u32 portid; -int report; -}; - -struct nf_exp_event_notifier { -int (*exp_event)(unsigned int events,struct nf_exp_event *item); -}; - -int nf_ct_expect_register_notifier (struct net *net, -struct nf_exp_event_notifier *nb); -void nf_ct_expect_unregister_notifier (struct net *net, -struct nf_exp_event_notifier *nb); -void nf_ct_expect_event_report (enum ip_conntrack_expect_events event,struct nf_conntrack_expect *exp,u32 portid,int report);
include/net/netns/conntrack.h +0 -1
@@ -115,7 +115,6 @@ struct netns_ct {struct ct_pcpu __percpu *pcpu_lists;struct ip_conntrack_stat __percpu *stat;struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb; -struct nf_exp_event_notifier __rcu *nf_expect_event_cb;struct nf_ip_net nf_ct_proto;#if defined(CONFIG_NF_CONNTRACK_LABELS )unsigned int labels_used;
net/netfilter/nf_conntrack_ecache.c +3 -40
61 lines not on this page · raw message
net/netfilter/nf_conntrack_netlink.c +3 -27
@@ -3104,7 +3104,7 @@ ctnetlink_exp_fill_info(struct sk_buff *skb, u32 portid, u32 seq,#ifdef CONFIG_NF_CONNTRACK_EVENTS static int -ctnetlink_expect_event (unsigned int events,struct nf_exp_event *item) +ctnetlink_expect_event (unsigned int events,const struct nf_exp_event *item) {struct nf_conntrack_expect *exp = item->exp;struct net *net =nf_ct_exp_net (exp);
@@ -3756,9 +3756,6 @@ static int ctnetlink_stat_exp_cpu(struct sk_buff *skb,#ifdef CONFIG_NF_CONNTRACK_EVENTS static struct nf_ct_event_notifier ctnl_notifier = { .ct_event = ctnetlink_conntrack_event, -}; - -static struct nf_exp_event_notifier ctnl_notifier_exp = { .exp_event = ctnetlink_expect_event, };#endif
@@ -3852,42 +3849,21 @@ MODULE_ALIAS_NFNL_SUBSYS(NFNL_SUBSYS_CTNETLINK_EXP);static int __net_init ctnetlink_net_init (struct net *net) {#ifdef CONFIG_NF_CONNTRACK_EVENTS -int ret; -nf_conntrack_register_notifier (net, &ctnl_notifier); - - ret =nf_ct_expect_register_notifier (net, &ctnl_notifier_exp); -if (ret <0 ) { -pr_err ("ctnetlink_init: cannot expect register notifier.\n" ); -nf_conntrack_unregister_notifier (net); -return ret; - }#endif return 0 ; } -static void ctnetlink_net_exit (struct net *net) +static void ctnetlink_net_pre_exit (struct net *net) {#ifdef CONFIG_NF_CONNTRACK_EVENTS -nf_ct_expect_unregister_notifier (net, &ctnl_notifier_exp);nf_conntrack_unregister_notifier (net);#endif } -static void __net_exit ctnetlink_net_exit_batch(struct list_head *net_exit_list) -{ -struct net *net; - -list_for_each_entry (net, net_exit_list, exit_list) -ctnetlink_net_exit (net); - -/* wait for other cpus until they are done with ctnl_notifiers */ -synchronize_rcu (); -} -static struct pernet_operations ctnetlink_net_ops = { .init = ctnetlink_net_init, - .exit_batch = ctnetlink_net_exit_batch, + .pre_exit = ctnetlink_net_pre_exit, };static int __init ctnetlink_init (void )
Signature · 1 line
2.31.1
Pablo Neira Ayuso
maintainerQuoted 11 lines · Florian Westphal
This patchset simplifies event registration handling.
Event and expectation handler registration is merged into one. This reduces boilerplate code during netns register/unregister.
Also, there is only one implementation of the event handler (ctnetlink), so it makes no sense to return
-EBUSYif another handler is registered already -- it cannot happen.This also allows to remove the '
nf_exp_event_notifier' pointer from struct net.
Series applied, thanks.