Skip to content

netfilter: conntrack: remove percpu lists

Florian Westphal netfilter-devel 5 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest10 patches 1 replyIn review
  2. v3 posting 2/216 patches 6 repliesSuperseded
  3. v3 RFC posting 1/215 patches 0 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v27 patches1 replyApplied
v17 patches3 repliesSuperseded

Changes in v4 from the cover letter

- drop patch to move to global event_cb in netlink
- this allows to drop the preceding nfnl patch
- drop cttimeout rcu patch, its not required
- amend commit message in patch 3 to mention need to move IPS_CONFIRMED bit setting.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/10netfilter: ecache: use dedicated list for event redeliveryinclude/net/netfilter/nf_conntrack.h include/net/netfilter/nf_conntrack_ecache.h net/netfilter/nf_conntrack_core.c +1 more+83 -730 replies
2/10netfilter: conntrack: include ecache dying list in dumpsinclude/net/netfilter/nf_conntrack_ecache.h net/netfilter/nf_conntrack_ecache.c net/netfilter/nf_conntrack_netlink.c+55 -00 replies
3/10netfilter: conntrack: remove the percpu dying listinclude/net/netns/conntrack.h net/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_ecache.c +1 more+13 -470 replies
4/10netfilter: cttimeout: decouple unlink and free on netns destructioninclude/net/netfilter/nf_conntrack_timeout.h net/netfilter/nfnetlink_cttimeout.c+28 -100 replies
5/10netfilter: remove nf_ct_unconfirmed_destroy helperinclude/net/netfilter/nf_conntrack.h net/netfilter/nf_conntrack_core.c net/netfilter/nfnetlink_cttimeout.c+3 -180 replies
6/10netfilter: extensions: introduce extension genid countinclude/net/netfilter/nf_conntrack_extend.h include/net/netfilter/nf_conntrack_labels.h net/netfilter/nf_conntrack_core.c +1 more+111 -170 replies
7/10netfilter: cttimeout: decouple unlink and free on netns destructionnet/netfilter/nfnetlink_cttimeout.c+12 -00 replies
8/10netfilter: conntrack: remove __nf_ct_unconfirmed_destroynet/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_helper.c net/netfilter/nfnetlink_cttimeout.c+13 -390 replies
9/10netfilter: conntrack: remove unconfirmed listinclude/net/netfilter/nf_conntrack.h include/net/netns/conntrack.h net/netfilter/nf_conntrack_core.c +1 more+3 -1020 replies
10/10netfilter: conntrack: avoid unconditional local_bh_disablenet/netfilter/nf_conntrack_core.c+2 -50 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v4 yet.

Read the v4 thread

Cover letter [PATCH nf-next v4 00/10] netfilter: conntrack: remove percpu lists

This series removes the unconfirmed and dying percpu lists.

Dying list is replaced by pernet list, only used when reliable event delivery mode was requested.

Unconfirmed list is replaced by a generation id for the conntrack extesions, to detect when pointers to external objects (timeout policy, helper, ...) has gone stale.

An alternative to the genid would be to always take references on such external objects, let me know if that is the preferred solution.

Changes in v4:
- drop patch to move to global event_cb in netlink
- this allows to drop the preceding nfnl patch
- drop cttimeout rcu patch, its not required
- amend commit message in patch 3 to mention need to move IPS_CONFIRMED bit setting.

Changes in v3:
- fix build bugs reported by kbuild robot
- add patch #16

Florian Westphal (10):
netfilter: ecache: use dedicated list for event redelivery
netfilter: conntrack: include ecache dying list in dumps
netfilter: conntrack: remove the percpu dying list
netfilter: cttimeout: decouple unlink and free on netns destruction
netfilter: remove nf_ct_unconfirmed_destroy helper
netfilter: extensions: introduce extension genid count
netfilter: cttimeout: decouple unlink and free on netns destruction
netfilter: conntrack: remove __nf_ct_unconfirmed_destroy
netfilter: conntrack: remove unconfirmed list
netfilter: conntrack: avoid unconditional local_bh_disable

 include/net/netfilter/nf_conntrack.h         |   7 +-
 include/net/netfilter/nf_conntrack_ecache.h  |   4 +-
 include/net/netfilter/nf_conntrack_extend.h  |  31 +--
 include/net/netfilter/nf_conntrack_labels.h  |  10 +-
 include/net/netfilter/nf_conntrack_timeout.h |   8 -
 include/net/netns/conntrack.h                |   7 -
 net/netfilter/nf_conntrack_core.c            | 230 ++++++++-----------
 net/netfilter/nf_conntrack_ecache.c          | 127 +++++-----
 net/netfilter/nf_conntrack_extend.c          |  32 ++-
 net/netfilter/nf_conntrack_helper.c          |   5 -
 net/netfilter/nf_conntrack_netlink.c         |  76 +++---
 net/netfilter/nfnetlink_cttimeout.c          |  47 +++-
 12 files changed, 298 insertions(+), 286 deletions(-)
Signature · 1 line
2.35.1