netfilter: conntrack: de-inline two helpers
Subsystems (2)
Florian Westphal
maintainercover netfilter: conntrack: de-inline two helpers
Noticed that we have two static inline functions that should be normal functions instead.
First patch saves a bit text size as well.
include/net/netfilter/nf_conntrack_ecache.h | 108 +++-------------------------net/netfilter/nf_conntrack_ecache.c | 84 +++++++++++++++++++++
2 files changed, 99 insertions(+), 93 deletions(-)
Florian Westphal
maintainerPATCH 1/2 netfilter: conntrack: de-inline nf_conntrack_eventmask_report
Way too large; move it to nf_conntrack_ecache.c. Reduces total object size by 1216 byte on my machine.
--- include/net/netfilter/nf_conntrack_ecache.h | 66 ++++++----------------------- net/netfilter/nf_conntrack_ecache.c | 54 +++++++++++++++++++++++ 2 files changed, 66 insertions(+), 54 deletions(-)
include/net/netfilter/nf_conntrack_ecache.h +12 -54
@@ -73,6 +73,8 @@ void nf_conntrack_unregister_notifier(struct net *net, struct nf_ct_event_notifier *nb);void nf_ct_deliver_cached_events (struct nf_conn *ct); +int nf_conntrack_eventmask_report (unsigned int eventmask,struct nf_conn *ct, +u32 portid,int report);static inline void nf_conntrack_event_cache (enum ip_conntrack_events event,struct nf_conn *ct)
@@ -91,69 +93,25 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct) }static inline int -nf_conntrack_eventmask_report (unsigned int eventmask, -struct nf_conn *ct, -u32 portid, -int report) -{ -int ret =0 ; -struct net *net =nf_ct_net (ct); -struct nf_ct_event_notifier *notify; -struct nf_conntrack_ecache *e; - -rcu_read_lock (); - notify =rcu_dereference (net->ct.nf_conntrack_event_cb); -if (notify ==NULL ) - goto out_unlock; - - e =nf_ct_ecache_find (ct); -if (e ==NULL ) - goto out_unlock; - -if (nf_ct_is_confirmed (ct) && !nf_ct_is_dying (ct)) { -struct nf_ct_event item = { - .ct = ct, - .portid = e->portid ? e->portid : portid, - .report = report - }; -/* This is a resent of a destroy event? If so, skip missed */ -unsigned long missed = e->portid ?0 : e->missed; - -if (!((eventmask | missed) & e->ctmask)) - 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 ) && - e->portid ==0 && portid !=0 ) - e->portid = portid; -else - e->missed |= eventmask; - }else - e->missed &= ~missed; -spin_unlock_bh (&ct->lock); - } - } -out_unlock: -rcu_read_unlock (); -return ret; -} - -static inline int nf_conntrack_event_report (enum ip_conntrack_events event,struct nf_conn *ct,u32 portid,int report) { +const struct net *net =nf_ct_net (ct); + +if (!rcu_access_pointer (net->ct.nf_conntrack_event_cb)) +return 0 ; +return nf_conntrack_eventmask_report (1 << event, ct, portid, report); }static inline int nf_conntrack_event (enum ip_conntrack_events event,struct nf_conn *ct) { +const struct net *net =nf_ct_net (ct); + +if (!rcu_access_pointer (net->ct.nf_conntrack_event_cb)) +return 0 ; +return nf_conntrack_eventmask_report (1 << event, ct,0 ,0 ); }
net/netfilter/nf_conntrack_ecache.c +54 -0
60 lines not on this page · raw message
Signature · 1 line
2.7.3
Florian Westphal
maintainerPATCH 2/2 netfilter: conntrack: move expectation event helper to ecache.c
In reply to Florian WestphalNot performance critical, it is only invoked when an expectation is added/destroyed.
While at it, kill unused nf_ct_expect_event() wrapper.
--- include/net/netfilter/nf_conntrack_ecache.h | 42 +++-------------------------- net/netfilter/nf_conntrack_ecache.c | 30 +++++++++++++++++++++ 2 files changed, 33 insertions(+), 39 deletions(-)
include/net/netfilter/nf_conntrack_ecache.h +3 -39
@@ -130,43 +130,9 @@ int nf_ct_expect_register_notifier(struct net *net,void nf_ct_expect_unregister_notifier (struct net *net,struct nf_exp_event_notifier *nb); -static inline void -nf_ct_expect_event_report (enum ip_conntrack_expect_events event, -struct nf_conntrack_expect *exp, -u32 portid, -int report) -{ -struct net *net =nf_ct_exp_net (exp); -struct nf_exp_event_notifier *notify; -struct nf_conntrack_ecache *e; - -rcu_read_lock (); - notify =rcu_dereference (net->ct.nf_expect_event_cb); -if (notify ==NULL ) - goto out_unlock; - - e =nf_ct_ecache_find (exp->master); -if (e ==NULL ) - goto out_unlock; - -if (e->expmask & (1 << event)) { -struct nf_exp_event item = { - .exp = exp, - .portid = portid, - .report = report - }; - notify->fcn (1 << event, &item); - } -out_unlock: -rcu_read_unlock (); -} - -static inline void -nf_ct_expect_event (enum ip_conntrack_expect_events event, -struct nf_conntrack_expect *exp) -{ -nf_ct_expect_event_report (event, exp,0 ,0 ); -} +void nf_ct_expect_event_report (enum ip_conntrack_expect_events event, +struct nf_conntrack_expect *exp, +u32 portid,int report);int nf_conntrack_ecache_pernet_init (struct net *net);void nf_conntrack_ecache_pernet_fini (struct net *net);
@@ -203,8 +169,6 @@ static inline int nf_conntrack_event_report(enum ip_conntrack_events event,u32 portid, int report) { return 0; }static inline void nf_ct_deliver_cached_events (const struct nf_conn *ct) {} -static inline void nf_ct_expect_event (enum ip_conntrack_expect_events event, -struct nf_conntrack_expect *exp) {} static inline void nf_ct_expect_event_report(enum ip_conntrack_expect_events e, struct nf_conntrack_expect *exp, u32 portid,
net/netfilter/nf_conntrack_ecache.c +30 -0
@@ -221,6 +221,36 @@ out_unlock: }EXPORT_SYMBOL_GPL (nf_ct_deliver_cached_events); +void nf_ct_expect_event_report (enum ip_conntrack_expect_events event, +struct nf_conntrack_expect *exp, +u32 portid,int report) + +{ +struct net *net =nf_ct_exp_net (exp); +struct nf_exp_event_notifier *notify; +struct nf_conntrack_ecache *e; + +rcu_read_lock (); + notify =rcu_dereference (net->ct.nf_expect_event_cb); +if (!notify) + goto out_unlock; + + e =nf_ct_ecache_find (exp->master); +if (!e) + goto out_unlock; + +if (e->expmask & (1 << event)) { +struct nf_exp_event item = { + .exp = exp, + .portid = portid, + .report = report + }; + notify->fcn (1 << event, &item); + } +out_unlock: +rcu_read_unlock (); +} +int nf_conntrack_register_notifier (struct net *net,struct nf_ct_event_notifier *new) {
Signature · 1 line
2.7.3
Pablo Neira Ayuso
maintainerQuoted 3 lines · Florian Westphal
Noticed that we have two static inline functions that should be normal functions instead.
First patch saves a bit text size as well.
Series applied, thanks.