Skip to content

Netfilter updates for net-next

Pablo Neira Ayuso 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 Latest19 patches 0 repliesApplied 19/19

Patches in v1 All 19 applied

#Subject and filesSizeRepliesApplied
1/19netfilter: conntrack: revisit gc autotuningnet/netfilter/nf_conntrack_core.c+68 -170 repliesApplied
2/19netfilter: conntrack: Add and use nf_ct_set_auto_assign_helper_warned()include/net/netfilter/nf_conntrack_helper.h net/netfilter/nf_conntrack_helper.c net/netfilter/nft_ct.c+10 -00 repliesApplied
3/19netfilter: nf_tables: do not reduce read-only expressionsinclude/net/netfilter/nf_tables.h net/bridge/netfilter/nft_reject_bridge.c net/ipv4/netfilter/nft_dup_ipv4.c +28 more+58 -10 repliesApplied
4/19netfilter: nf_tables: cancel tracking for clobbered destination registersinclude/net/netfilter/nf_tables.h include/net/netfilter/nft_meta.h net/bridge/netfilter/nft_meta_bridge.c +5 more+95 -280 repliesApplied
5/19netfilter: nft_ct: track register operationsnet/netfilter/nft_bitwise.c net/netfilter/nft_ct.c+48 -00 repliesApplied
6/19netfilter: nft_lookup: only cancel tracking for clobbered dregsnet/netfilter/nft_lookup.c+12 -00 repliesApplied
7/19netfilter: nft_meta: extend reduce support to bridge familyinclude/net/netfilter/nft_meta.h net/bridge/netfilter/nft_meta_bridge.c net/netfilter/nft_meta.c+6 -20 repliesApplied
8/19netfilter: nft_numgen: cancel register trackingnet/netfilter/nft_numgen.c+22 -00 repliesApplied
9/19netfilter: nft_osf: track register operationsnet/netfilter/nft_osf.c+25 -00 repliesApplied
10/19netfilter: nft_hash: track register operationsnet/netfilter/nft_hash.c+36 -00 repliesApplied
11/19netfilter: nft_immediate: cancel register tracking for data destination registernet/netfilter/nft_immediate.c+12 -00 repliesApplied
12/19netfilter: nft_socket: track register operationsnet/netfilter/nft_socket.c+28 -00 repliesApplied
13/19netfilter: nft_xfrm: track register operationsnet/netfilter/nft_xfrm.c+28 -00 repliesApplied
14/19netfilter: nft_tunnel: track register operationsnet/netfilter/nft_tunnel.c+28 -00 repliesApplied
15/19netfilter: nft_fib: add reduce supportinclude/net/netfilter/nft_fib.h net/ipv4/netfilter/nft_fib_ipv4.c net/ipv6/netfilter/nft_fib_ipv6.c +3 more+51 -00 repliesApplied
16/19netfilter: nft_exthdr: add reduce supportnet/netfilter/nft_exthdr.c+33 -00 repliesApplied
17/19netfilter: nf_nat_h323: eliminate anonymous module_init & module_exitnet/ipv4/netfilter/nf_nat_h323.c+4 -40 repliesApplied
18/19netfilter: flowtable: remove redundant field in flow_offload_work structnet/netfilter/nf_flow_table_offload.c+6 -50 repliesApplied
19/19netfilter: flowtable: pass flowtable to nf_flow_table_iterate()net/netfilter/nf_flow_table_core.c+10 -100 repliesApplied

Reviews trailers per patch

1 of 19 patches has a Reviewed-by or Acked-by.

PatchFlorian Westphal
1/19
2/19
3/19
4/19
5/19
6/19
7/19
8/19
9/19
10/19
11/19
12/19
13/19
14/19
15/19
16/19
17/19A-b
18/19
19/19

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH net-next 00/19] Netfilter updates for net-next

Hi,

The following patchset contains Netfilter updates for net-next. This patchset contains updates for the nf_tables register tracking infrastructure, disable bogus warning when attaching ct helpers, one namespace pollution fix and few cleanups for the flowtable.

1) Revisit conntrack gc routine to reduce chances of overruning the netlink buffer from the event path. From Florian Westphal.

2) Disable warning on explicit ct helper assignment, from Phil Sutter.

3) Read-only expressions do not update registers, mark them as NFT_REDUCE_READONLY. Add helper functions to update the register tracking information. This patch re-enables the register tracking infrastructure.

4) Cancel register tracking in case an expression fully/partially clobbers existing data.

5) Add register tracking support for remaining expressions: ct, lookup, meta, numgen, osf, hash, immediate, socket, xfrm, tunnel, fib, exthdr.

6) Rename init and exit functions for the conntrack h323 helper, from Randy Dunlap.

7) Remove redundant field in struct flow_offload_work.

8) Update nf_flow_table_iterate() to pass flowtable to callback.

Please, pull these changes from:

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

Thanks.

----------------------------------------------------------------

The following changes since commit 092d992b76ed9d06389af0bc5efd5279d7b1ed9f:

Merge tag 'mlx5-updates-2022-03-18' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux (2022-03-19 14:50:19 +0000)

are available in the Git repository at:

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

for you to fetch changes up to 217cff36e885627c41a14e803fc44f9cbc945767:

netfilter: flowtable: pass flowtable to nf_flow_table_iterate() (2022-03-20 00:29:48 +0100)

----------------------------------------------------------------
Florian Westphal (5):
netfilter: conntrack: revisit gc autotuning
netfilter: nft_lookup: only cancel tracking for clobbered dregs
netfilter: nft_meta: extend reduce support to bridge family
netfilter: nft_fib: add reduce support
netfilter: nft_exthdr: add reduce support

Pablo Neira Ayuso (12):
netfilter: nf_tables: do not reduce read-only expressions
netfilter: nf_tables: cancel tracking for clobbered destination registers
netfilter: nft_ct: track register operations
netfilter: nft_numgen: cancel register tracking
netfilter: nft_osf: track register operations
netfilter: nft_hash: track register operations
netfilter: nft_immediate: cancel register tracking for data destination register
netfilter: nft_socket: track register operations
netfilter: nft_xfrm: track register operations
netfilter: nft_tunnel: track register operations
netfilter: flowtable: remove redundant field in flow_offload_work struct
netfilter: flowtable: pass flowtable to nf_flow_table_iterate()

Phil Sutter (1):
netfilter: conntrack: Add and use nf_ct_set_auto_assign_helper_warned()

Randy Dunlap (1):
netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit

 include/net/netfilter/nf_conntrack_helper.h |  1 +
 include/net/netfilter/nf_tables.h           | 22 ++++++++
 include/net/netfilter/nft_fib.h             |  3 +
 include/net/netfilter/nft_meta.h            |  3 +
 net/bridge/netfilter/nft_meta_bridge.c      |  5 +-
 net/bridge/netfilter/nft_reject_bridge.c    |  1 +
 net/ipv4/netfilter/nf_nat_h323.c            |  8 +--
 net/ipv4/netfilter/nft_dup_ipv4.c           |  1 +
 net/ipv4/netfilter/nft_fib_ipv4.c           |  2 +
 net/ipv4/netfilter/nft_reject_ipv4.c        |  1 +
 net/ipv6/netfilter/nft_dup_ipv6.c           |  1 +
 net/ipv6/netfilter/nft_fib_ipv6.c           |  2 +
 net/ipv6/netfilter/nft_reject_ipv6.c        |  1 +
 net/netfilter/nf_conntrack_core.c           | 85 +++++++++++++++++++++++------
 net/netfilter/nf_conntrack_helper.c         |  6 ++
 net/netfilter/nf_flow_table_core.c          | 20 +++----
 net/netfilter/nf_flow_table_offload.c       | 11 ++--
 net/netfilter/nf_tables_api.c               | 63 ++++++++++++++++++++-
 net/netfilter/nft_bitwise.c                 | 24 +++++---
 net/netfilter/nft_byteorder.c               |  3 +-
 net/netfilter/nft_cmp.c                     |  3 +
 net/netfilter/nft_compat.c                  |  1 +
 net/netfilter/nft_connlimit.c               |  1 +
 net/netfilter/nft_counter.c                 |  1 +
 net/netfilter/nft_ct.c                      | 51 +++++++++++++++++
 net/netfilter/nft_dup_netdev.c              |  1 +
 net/netfilter/nft_dynset.c                  |  1 +
 net/netfilter/nft_exthdr.c                  | 33 +++++++++++
 net/netfilter/nft_fib.c                     | 42 ++++++++++++++
 net/netfilter/nft_fib_inet.c                |  1 +
 net/netfilter/nft_fib_netdev.c              |  1 +
 net/netfilter/nft_flow_offload.c            |  1 +
 net/netfilter/nft_fwd_netdev.c              |  2 +
 net/netfilter/nft_hash.c                    | 36 ++++++++++++
 net/netfilter/nft_immediate.c               | 12 ++++
 net/netfilter/nft_last.c                    |  1 +
 net/netfilter/nft_limit.c                   |  2 +
 net/netfilter/nft_log.c                     |  1 +
 net/netfilter/nft_lookup.c                  | 12 ++++
 net/netfilter/nft_masq.c                    |  3 +
 net/netfilter/nft_meta.c                    | 19 +++----
 net/netfilter/nft_nat.c                     |  2 +
 net/netfilter/nft_numgen.c                  | 22 ++++++++
 net/netfilter/nft_objref.c                  |  2 +
 net/netfilter/nft_osf.c                     | 25 +++++++++
 net/netfilter/nft_payload.c                 | 12 ++--
 net/netfilter/nft_queue.c                   |  2 +
 net/netfilter/nft_quota.c                   |  1 +
 net/netfilter/nft_range.c                   |  1 +
 net/netfilter/nft_redir.c                   |  3 +
 net/netfilter/nft_reject_inet.c             |  1 +
 net/netfilter/nft_reject_netdev.c           |  1 +
 net/netfilter/nft_rt.c                      |  1 +
 net/netfilter/nft_socket.c                  | 28 ++++++++++
 net/netfilter/nft_synproxy.c                |  1 +
 net/netfilter/nft_tproxy.c                  |  1 +
 net/netfilter/nft_tunnel.c                  | 28 ++++++++++
 net/netfilter/nft_xfrm.c                    | 28 ++++++++++
 58 files changed, 580 insertions(+), 67 deletions(-)