Netfilter/IPVS updates for net-next
Status from this message: This series was applied to netdev/net-next.git (main)
Get series with b4
b4 am [email protected]Versions newest first
Patches in v1 All 17 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/17 | netfilter: nf_tables: make struct nft_trans first member of derived subtypesinclude/ net/ | +105 | 0 replies | Applied |
| 2/17 | netfilter: nf_tables: move bind list_head into relevant subtypesinclude/ net/ | +75 | 0 replies | Applied |
| 3/17 | netfilter: nf_tables: compact chain+ft transaction objectsinclude/ | +2 | 0 replies | Applied |
| 4/17 | netfilter: nf_tables: reduce trans->ctx.table referencesnet/ | +41 | 0 replies | Applied |
| 5/17 | netfilter: nf_tables: pass nft_chain to destroy function, not nft_ctxinclude/ net/ net/ | +10 | 0 replies | Applied |
| 6/17 | netfilter: nf_tables: pass more specific nft_trans_chain where possiblenet/ | +26 | 0 replies | Applied |
| 7/17 | netfilter: nf_tables: avoid usage of embedded nft_ctxnet/ net/ | +13 | 0 replies | Applied |
| 8/17 | netfilter: nf_tables: store chain pointer in rule transactioninclude/ net/ net/ | +22 | 0 replies | Applied |
| 9/17 | netfilter: nf_tables: reduce trans->ctx.chain referencesnet/ | +7 | 0 replies | Applied |
| 10/17 | netfilter: nf_tables: pass nft_table to destroy functionnet/ | +9 | 0 replies | Applied |
| 11/17 | netfilter: nf_tables: do not store nft_ctx in transaction objectsinclude/ net/ net/ | +125 | 0 replies | Applied |
| 12/17 | ipvs: Avoid unnecessary calls to skb_is_gso_sctpnet/ | +2 | 0 replies | Applied |
| 13/17 | netfilter: nf_conncount: fix wrong variable typenet/ | +3 | 0 replies | Applied |
| 14/17 | netfilter: cttimeout: remove 'l3num' attr checknet/ | +1 | 0 replies | Applied |
| 15/17 | netfilter: nf_tables: rise cap on SELinux secmark contextinclude/ | +1 | 0 replies | Applied |
| 16/17 | selftests: netfilter: nft_queue.sh: add test for disappearing listenertools/ | +37 | 0 replies | Applied |
| 17/17 | netfilter: xt_recent: Lift restrictions on max hitcount valuenet/ | +4 | 0 replies | Applied |
Reviews trailers per patch
2 of 17 patches have a Reviewed-by or Acked-by.
| Patch | Julian Anastasov | Simon Horman | Fabio |
|---|---|---|---|
| 1/17 | |||
| 2/17 | |||
| 3/17 | |||
| 4/17 | |||
| 5/17 | |||
| 6/17 | |||
| 7/17 | |||
| 8/17 | |||
| 9/17 | |||
| 10/17 | |||
| 11/17 | |||
| 12/17 | A-b | A-b | |
| 13/17 | |||
| 14/17 | R-b | ||
| 15/17 | |||
| 16/17 | |||
| 17/17 | Requested-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.
Cover letter [PATCH net-next 00/17] Netfilter/IPVS updates for net-next
Note: New PR excluding SCTP nfqueue updates.
-o-
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 adds a selftest to exercise nfnetlink_queue listeners leaving
nfnetlink_queue, from Florian Westphal.
Patch #17 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-28
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-28
for you to fetch changes up to f4ebd03496f6b67940b0af92ce885c1d0dc9e121:
netfilter: xt_recent: Lift restrictions on max hitcount value (2024-06-28 17:57:50 +0200)
----------------------------------------------------------------
netfilter pull request 24-06-28
----------------------------------------------------------------
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/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/nft_immediate.c | 2 +- net/netfilter/xt_recent.c | 8 +- tools/testing/selftests/net/netfilter/nft_queue.sh | 37 ++ 10 files changed, 459 insertions(+), 278 deletions(-)