Skip to content

Netfilter/IPVS updates for net-next

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest19 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19netfilter: nf_tables: make struct nft_trans first member of derived subtypesinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+105 -750 replies
2/19netfilter: nf_tables: move bind list_head into relevant subtypesinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c+75 -220 replies
3/19netfilter: nf_tables: compact chain+ft transaction objectsinclude/net/netfilter/nf_tables.h+2 -20 replies
4/19netfilter: nf_tables: reduce trans->ctx.table referencesnet/netfilter/nf_tables_api.c+41 -380 replies
5/19netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctxinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c net/netfilter/nft_immediate.c+10 -110 replies
6/19netfilter: nf_tables: pass more specific nft_trans_chain where possiblenet/netfilter/nf_tables_api.c+26 -250 replies
7/19netfilter: nf_tables: avoid usage of embedded nft_ctxnet/netfilter/nf_tables_api.c net/netfilter/nf_tables_offload.c+13 -130 replies
8/19netfilter: nf_tables: store chain pointer in rule transactioninclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c net/netfilter/nf_tables_offload.c+22 -180 replies
9/19netfilter: nf_tables: reduce trans->ctx.chain referencesnet/netfilter/nf_tables_api.c+7 -90 replies
10/19netfilter: nf_tables: pass nft_table to destroy functionnet/netfilter/nf_tables_api.c+9 -90 replies
11/19netfilter: nf_tables: do not store nft_ctx in transaction objectsinclude/net/netfilter/nf_tables.h net/netfilter/nf_tables_api.c net/netfilter/nf_tables_offload.c+125 -660 replies
12/19ipvs: Avoid unnecessary calls to skb_is_gso_sctpnet/netfilter/ipvs/ip_vs_proto_sctp.c+2 -20 replies
13/19netfilter: nf_conncount: fix wrong variable typenet/netfilter/nf_conncount.c+3 -50 replies
14/19netfilter: cttimeout: remove 'l3num' attr checknet/netfilter/nfnetlink_cttimeout.c+1 -20 replies
15/19netfilter: nf_tables: rise cap on SELinux secmark contextinclude/uapi/linux/netfilter/nf_tables.h+1 -10 replies
16/19netfilter: nfnetlink_queue: unbreak SCTP trafficnet/core/dev.c net/netfilter/nfnetlink_queue.c+11 -20 replies
17/19selftests: netfilter: nft_queue.sh: sctp coveragetools/testing/selftests/net/netfilter/nft_queue.sh+76 -00 replies
18/19selftests: netfilter: nft_queue.sh: add test for disappearing listenertools/testing/selftests/net/netfilter/nft_queue.sh+37 -00 replies
19/19netfilter: xt_recent: Lift restrictions on max hitcount valuenet/netfilter/xt_recent.c+4 -40 replies

Reviews trailers per patch

2 of 19 patches have a Reviewed-by or Acked-by.

PatchJulian AnastasovSimon HormanFabio
1/19
2/19
3/19
4/19
5/19
6/19
7/19
8/19
9/19
10/19
11/19
12/19A-b A-b
13/19
14/19R-b
15/19
16/19
17/19
18/19
19/19Requested-by

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

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

Hi,

The following patchset contains Netfilter/IPVS updates for net-next:

Patch #1 to #11 to shrink memory consumption for transaction objects:

struct nft_trans_chain { /* size: 120 (-32), cachelines: 2, members: 10 */ struct nft_trans_elem { /* size: 72 (-40), cachelines: 2, members: 4 */ struct nft_trans_flowtable { /* size: 80 (-48), cachelines: 2, members: 5 */ struct nft_trans_obj { /* size: 72 (-40), cachelines: 2, members: 4 */ struct nft_trans_rule { /* size: 80 (-32), cachelines: 2, members: 6 */ struct nft_trans_set { /* size: 96 (-24), cachelines: 2, members: 8 */ struct nft_trans_table { /* size: 56 (-40), cachelines: 1, members: 2 */

struct nft_trans_elem can now be allocated from kmalloc-96 instead of kmalloc-128 slab.

Series from Florian Westphal. For the record, I have mangled patch #1 to add nft_trans_container_*() and use if for every transaction object.
I have also added BUILD_BUG_ON to ensure struct nft_trans always comes
at the beginning of the container transaction object. And few minor cleanups, any new bugs are of my own.

Patch #12 simplify check for SCTP GSO in IPVS, from Ismael Luceno.

Patch #13 nf_conncount key length remains in the u32 bound, from Yunjian Wang.

Patch #14 removes unnecessary check for CTA_TIMEOUT_L3PROTO when setting
default conntrack timeouts via nfnetlink_cttimeout API, from Lin Ma.

Patch #15 updates NFT_SECMARK_CTX_MAXLEN to 4096, SELinux could use
larger secctx names than the existing 256 bytes length.

Patch #16 fixes nfnetlink_queue with SCTP traffic, from Antonio Ojea.

Patch #17 adds a selftest for SCTP traffic under nfnetlink_queue,
also from Antonio.

Patch #18 adds a selftest to exercise nfnetlink_queue listeners leaving
nfnetlink_queue, from Florian Westphal.

Patch #19 increases hitcount from 255 to 65535 in xt_recent, from Phil Sutter.

Please, pull these changes from:

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

Thanks.

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

The following changes since commit c4532232fa2a4f8d9b9a88135a666545157f3d13:

selftests: net: remove unneeded IP_GRE config (2024-06-25 08:37:55 -0700)

are available in the Git repository at:

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

for you to fetch changes up to 8871d1e4dceb6692ea8217b1fc835c4bf2e93d97:

netfilter: xt_recent: Lift restrictions on max hitcount value (2024-06-27 01:55:57 +0200)

----------------------------------------------------------------
netfilter pull request 24-06-27

----------------------------------------------------------------
Antonio Ojea (2):
netfilter: nfnetlink_queue: unbreak SCTP traffic
selftests: netfilter: nft_queue.sh: sctp coverage

Florian Westphal (12):
netfilter: nf_tables: make struct nft_trans first member of derived subtypes
netfilter: nf_tables: move bind list_head into relevant subtypes
netfilter: nf_tables: compact chain+ft transaction objects
netfilter: nf_tables: reduce trans->ctx.table references
netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctx
netfilter: nf_tables: pass more specific nft_trans_chain where possible
netfilter: nf_tables: avoid usage of embedded nft_ctx
netfilter: nf_tables: store chain pointer in rule transaction
netfilter: nf_tables: reduce trans->ctx.chain references
netfilter: nf_tables: pass nft_table to destroy function
netfilter: nf_tables: do not store nft_ctx in transaction objects
selftests: netfilter: nft_queue.sh: add test for disappearing listener

Ismael Luceno (1):
ipvs: Avoid unnecessary calls to skb_is_gso_sctp

Lin Ma (1):
netfilter: cttimeout: remove 'l3num' attr check

Pablo Neira Ayuso (1):
netfilter: nf_tables: rise cap on SELinux secmark context

Phil Sutter (1):
netfilter: xt_recent: Lift restrictions on max hitcount value

Yunjian Wang (1):
netfilter: nf_conncount: fix wrong variable type

 include/net/netfilter/nf_tables.h                  | 222 +++++++----
 include/uapi/linux/netfilter/nf_tables.h           |   2 +-
 net/core/dev.c                                     |   1 +
 net/netfilter/ipvs/ip_vs_proto_sctp.c              |   4 +-
 net/netfilter/nf_conncount.c                       |   8 +-
 net/netfilter/nf_tables_api.c                      | 411 ++++++++++++---------
 net/netfilter/nf_tables_offload.c                  |  40 +-
 net/netfilter/nfnetlink_cttimeout.c                |   3 +-
 net/netfilter/nfnetlink_queue.c                    |  12 +-
 net/netfilter/nft_immediate.c                      |   2 +-
 net/netfilter/xt_recent.c                          |   8 +-
 tools/testing/selftests/net/netfilter/nft_queue.sh | 113 ++++++
 12 files changed, 546 insertions(+), 280 deletions(-)