Skip to content

Netfilter updates for net-next

Florian Westphal netdev netfilter-devel 1 version Applied

Status from this message: This series was applied to netdev/net-next.git (master)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest9 patches 4 repliesApplied 9/9

Patches in v1 All 9 applied

#Subject and filesSizeRepliesApplied
1/9netfilter: conntrack: sctp: use nf log infrastructure for invalid packetsnet/netfilter/nf_conntrack_proto_sctp.c+15 -310 repliesApplied
2/9netfilter: conntrack: remove pr_debug callsnet/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_proto.c net/netfilter/nf_conntrack_proto_tcp.c+5 -440 repliesApplied
3/9netfilter: conntrack: avoid reload of ct->statusnet/netfilter/nf_conntrack_core.c net/netfilter/nf_conntrack_proto_udp.c+11 -81 replyApplied
4/9netfilter: conntrack: move rcu read lock to nf_conntrack_find_getnet/netfilter/nf_conntrack_core.c+9 -80 repliesApplied
5/9netfilter: ip_tables: remove clusterip targetnet/ipv4/netfilter/Kconfig net/ipv4/netfilter/Makefile net/ipv4/netfilter/ipt_CLUSTERIP.c+0 -9440 repliesApplied
6/9netfilter: nf_tables: add static key to skip retpoline workaroundsnet/netfilter/nf_tables_core.c+29 -10 repliesApplied
7/9netfilter: nf_tables: avoid retpoline overhead for objref callsinclude/net/netfilter/nf_tables_core.h net/netfilter/nf_tables_core.c net/netfilter/nft_objref.c+12 -60 repliesApplied
8/9netfilter: nf_tables: avoid retpoline overhead for some ct expression callsinclude/net/netfilter/nf_tables_core.h net/netfilter/Makefile net/netfilter/nf_tables_core.c +2 more+104 -120 repliesApplied
9/9netfilter: nf_tables: add support to destroy operationinclude/uapi/linux/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+117 -83 repliesApplied

Reviews trailers per patch

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

Read the v1 thread

Cover letter [PATCH net-next 0/9] Netfilter updates for net-next

Hello,

following patch set includes netfilter updates for your *net-next* tree.

1. Replace pr_debug use with nf_log infra for debugging in sctp conntrack.
2. Remove pr_debug calls, they are either useless or we have better options in place.
3. Avoid repeated load of ct->status in some spots.
Some bit-flags cannot change during the lifeetime of
a connection, so no need to re-fetch those.
4. Avoid uneeded nesting of rcu_read_lock during tuple lookup.
5. Remove the CLUSTERIP target. Marked as obsolete for years, and we still have WARN splats wrt. races of the out-of-band /proc interface installed by this target.
6. Add static key to nf_tables to avoid the retpoline mitigation if/else if cascade provided the cpu doesn't need the retpoline thunk.
7. add nf_tables objref calls to the retpoline mitigation workaround.
8. Split parts of nft_ct.c that do not need symbols exported by the conntrack modules and place them in nf_tables directly. This allows to avoid indirect call for 'ct status' checks.
9. Add 'destroy' commands to nf_tables. They are identical to the existing 'delete' commands, but do not indicate
an error if the referenced object (set, chain, rule...) did not exist, from Fernando.

The following changes since commit c4791b3196bf46367bcf6cc56a09b32e037c4f49:

Merge branch 'net-mdio-continue-separating-c22-and-c45' (2023-01-17 19:34:10 -0800)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git

for you to fetch changes up to f80a612dd77c4585171e44a06b490466bdeec1ae:

netfilter: nf_tables: add support to destroy operation (2023-01-18 13:09:00 +0100)

----------------------------------------------------------------
Fernando Fernandez Mancera (1):
netfilter: nf_tables: add support to destroy operation

Florian Westphal (8):
netfilter: conntrack: sctp: use nf log infrastructure for invalid packets
netfilter: conntrack: remove pr_debug calls
netfilter: conntrack: avoid reload of ct->status
netfilter: conntrack: move rcu read lock to nf_conntrack_find_get
netfilter: ip_tables: remove clusterip target
netfilter: nf_tables: add static key to skip retpoline workarounds
netfilter: nf_tables: avoid retpoline overhead for objref calls
netfilter: nf_tables: avoid retpoline overhead for some ct expression calls

 include/net/netfilter/nf_tables_core.h   |  16 +
 include/uapi/linux/netfilter/nf_tables.h |  14 +
 net/ipv4/netfilter/Kconfig               |  14 -
 net/ipv4/netfilter/Makefile              |   1 -
 net/ipv4/netfilter/ipt_CLUSTERIP.c       | 929 -------------------------------
 net/netfilter/Makefile                   |   6 +
 net/netfilter/nf_conntrack_core.c        |  46 +-
 net/netfilter/nf_conntrack_proto.c       |  20 +-
 net/netfilter/nf_conntrack_proto_sctp.c  |  46 +-
 net/netfilter/nf_conntrack_proto_tcp.c   |   9 -
 net/netfilter/nf_conntrack_proto_udp.c   |  10 +-
 net/netfilter/nf_tables_api.c            | 111 +++-
 net/netfilter/nf_tables_core.c           |  35 +-
 net/netfilter/nft_ct.c                   |  39 +-
 net/netfilter/nft_ct_fast.c              |  56 ++
 net/netfilter/nft_objref.c               |  12 +-
 16 files changed, 302 insertions(+), 1062 deletions(-)
 delete mode 100644 net/ipv4/netfilter/ipt_CLUSTERIP.c
 create mode 100644 net/netfilter/nft_ct_fast.c
Signature · 1 line
2.38.2