mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 17:01:14 +00:00
netfilter: nf_ct_ecache: refactor nf_ct_deliver_cached_events
* identation lowered * some CPU cycles saved at delayed item variable initialization Signed-off-by: Tony Zelenoff <antonz@parallels.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
93326ae312
commit
58020f7761
1 changed files with 27 additions and 24 deletions
|
@ -32,9 +32,11 @@ static DEFINE_MUTEX(nf_ct_ecache_mutex);
|
|||
void nf_ct_deliver_cached_events(struct nf_conn *ct)
|
||||
{
|
||||
struct net *net = nf_ct_net(ct);
|
||||
unsigned long events;
|
||||
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);
|
||||
|
@ -47,31 +49,32 @@ void nf_ct_deliver_cached_events(struct nf_conn *ct)
|
|||
|
||||
events = xchg(&e->cache, 0);
|
||||
|
||||
if (nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct) && events) {
|
||||
struct nf_ct_event item = {
|
||||
.ct = ct,
|
||||
.pid = 0,
|
||||
.report = 0
|
||||
};
|
||||
int ret;
|
||||
/* 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. */
|
||||
unsigned long missed = e->missed;
|
||||
if (!nf_ct_is_confirmed(ct) || nf_ct_is_dying(ct) || !events)
|
||||
goto out_unlock;
|
||||
|
||||
if (!((events | missed) & e->ctmask))
|
||||
goto out_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. */
|
||||
missed = e->missed;
|
||||
|
||||
ret = notify->fcn(events | missed, &item);
|
||||
if (unlikely(ret < 0 || missed)) {
|
||||
spin_lock_bh(&ct->lock);
|
||||
if (ret < 0)
|
||||
e->missed |= events;
|
||||
else
|
||||
e->missed &= ~missed;
|
||||
spin_unlock_bh(&ct->lock);
|
||||
}
|
||||
}
|
||||
if (!((events | missed) & e->ctmask))
|
||||
goto out_unlock;
|
||||
|
||||
item.ct = ct;
|
||||
item.pid = 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();
|
||||
|
|
Loading…
Reference in a new issue