]> git.baikalelectronics.ru Git - kernel.git/commit
netfilter: conntrack: remove timer from ecache extension
authorFlorian Westphal <fw@strlen.de>
Tue, 10 Jun 2014 21:12:56 +0000 (23:12 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 25 Jun 2014 17:15:38 +0000 (19:15 +0200)
commit23c82d19e99f53d5136f18dd33a0245103086c04
treeae02c076af642052494bcc4f97bfa855ccb17498
parentc946d7a6b71d1729105cb01ea072744e36c9ada3
netfilter: conntrack: remove timer from ecache extension

This brings the (per-conntrack) ecache extension back to 24 bytes in size
(was 152 byte on x86_64 with lockdep on).

When event delivery fails, re-delivery is attempted via work queue.

Redelivery is attempted at least every 0.1 seconds, but can happen
more frequently if userspace is not congested.

The nf_ct_release_dying_list() function is removed.
With this patch, ownership of the to-be-redelivered conntracks
(on-dying-list-with-DYING-bit not yet set) is with the work queue,
which will release the references once event is out.

Joint work with Pablo Neira Ayuso.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/nf_conntrack_ecache.h
include/net/netns/conntrack.h
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_ecache.c