Hi,
The following patchset contains Netfilter fixes for net:
1) Narrow down target/match revision to u8 in nft_compat.
2) Bail out with unused flags in nft_compat.
3) Restrict layer 4 protocol to u16 in nft_compat.
4) Remove static in pipapo get command that slipped through when
reducing set memory footprint.
5) Follow up incremental fix for the ipset performance regression,
this includes the missing gc cancellation, from Jozsef Kadlecsik.
6) Allow to filter by zone 0 in ctnetlink, do not interpret zone 0
as no filtering, from Felix Huettner.
7) Reject direction for NFT_CT_ID.
8) Use timestamp to check for set element expiration while transaction
is handled to prevent garbage collection from removing set elements
that were just added by this transaction. Packet path and netlink
dump/get path still use current time to check for expiration.
9) Restore NF_REPEAT in nfnetlink_queue, from Florian Westphal.
10) map_index needs to be percpu and per-set, not just percpu.
At this time its possible for a pipapo set to fill the all-zero part
with ones and take the 'might have bits set' as 'start-from-zero' area.
From Florian Westphal. This includes three patches:
- Change scratchpad area to a structure that provides space for a
per-set-and-cpu toggle and uses it of the percpu one.
- Add a new free helper to prepare for the next patch.
- Remove the scratch_aligned pointer and makes AVX2 implementation
use the exact same memory addresses for read/store of the matching
state.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git nf-24-02-08
Thanks.
----------------------------------------------------------------
The following changes since commit eef00a82c568944f113f2de738156ac591bbd5cd:
inet: read sk->sk_family once in inet_recv_error() (2024-02-04 16:06:53 +0000)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git tags/nf-24-02-08
for you to fetch changes up to a7eaa3316ffa17957ee70a705000a3a942128820:
netfilter: nft_set_pipapo: remove scratch_aligned pointer (2024-02-07 22:56:30 +0100)
----------------------------------------------------------------
netfilter pull request 24-02-08
----------------------------------------------------------------
Felix Huettner (1):
netfilter: ctnetlink: fix filtering for zone 0
Florian Westphal (4):
netfilter: nfnetlink_queue: un-break NF_REPEAT
netfilter: nft_set_pipapo: store index in scratch maps
netfilter: nft_set_pipapo: add helper to release pcpu scratch area
netfilter: nft_set_pipapo: remove scratch_aligned pointer
Jozsef Kadlecsik (1):
netfilter: ipset: Missing gc cancellations fixed
Pablo Neira Ayuso (7):
netfilter: nft_compat: narrow down revision to unsigned 8-bits
netfilter: nft_compat: reject unused compat flag
netfilter: nft_compat: restrict match/target protocol to u16
netfilter: nft_set_pipapo: remove static in nft_pipapo_get()
netfilter: nft_ct: reject direction for ct id
netfilter: nf_tables: use timestamp to check for set element timeout
netfilter: nft_set_rbtree: skip end interval element from gc
include/net/netfilter/nf_tables.h | 16 ++-
include/uapi/linux/netfilter/nf_tables.h | 2 +
net/netfilter/ipset/ip_set_core.c | 2 +
net/netfilter/ipset/ip_set_hash_gen.h | 4 +-
net/netfilter/nf_conntrack_netlink.c | 12 +-
net/netfilter/nf_tables_api.c | 4 +-
net/netfilter/nfnetlink_queue.c | 13 ++-
net/netfilter/nft_compat.c | 17 ++-
net/netfilter/nft_ct.c | 3 +
net/netfilter/nft_set_hash.c | 8 +-
net/netfilter/nft_set_pipapo.c | 127 +++++++++++----------
net/netfilter/nft_set_pipapo.h | 18 ++-
net/netfilter/nft_set_pipapo_avx2.c | 17 ++-
net/netfilter/nft_set_rbtree.c | 17 +--
.../selftests/netfilter/conntrack_dump_flush.c | 43 ++++++-
15 files changed, 201 insertions(+), 102 deletions(-)
Hi, The following patchset contains Netfilter fixes for net: 1) Narrow down target/match revision to u8 in nft_compat. 2) Bail out with unused flags in nft_compat. 3) Restrict layer 4 protocol to u16 in nft_compat. 4) Remove static in pipapo get command that slipped through when reducing set memory footprint. 5) Follow up incremental fix for the ipset performance regression, this includes the missing gc cancellation, from Jozsef Kadlecsik. 6) Allow to filter by zone 0 in ctnetlink, do not interpret zone 0 as no filtering, from Felix Huettner. 7) Reject direction for NFT_CT_ID. 8) Use timestamp to check for set element expiration while transaction is handled to prevent garbage collection from removing set elements that were just added by this transaction. Packet path and netlink dump/get path still use current time to check for expiration. 9) Restore NF_REPEAT in nfnetlink_queue, from Florian Westphal. 10) map_index needs to be percpu and per-set, not just percpu. At this time its possible for a pipapo set to fill the all-zero part with ones and take the 'might have bits set' as 'start-from-zero' area. From Florian Westphal. This includes three patches: - Change scratchpad area to a structure that provides space for a per-set-and-cpu toggle and uses it of the percpu one. - Add a new free helper to prepare for the next patch. - Remove the scratch_aligned pointer and makes AVX2 implementation use the exact same memory addresses for read/store of the matching state. Please, pull these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git nf-24-02-08 Thanks. ---------------------------------------------------------------- The following changes since commit eef00a82c568944f113f2de738156ac591bbd5cd: inet: read sk->sk_family once in inet_recv_error() (2024-02-04 16:06:53 +0000) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git tags/nf-24-02-08 for you to fetch changes up to a7eaa3316ffa17957ee70a705000a3a942128820: netfilter: nft_set_pipapo: remove scratch_aligned pointer (2024-02-07 22:56:30 +0100) ---------------------------------------------------------------- netfilter pull request 24-02-08 ---------------------------------------------------------------- Felix Huettner (1): netfilter: ctnetlink: fix filtering for zone 0 Florian Westphal (4): netfilter: nfnetlink_queue: un-break NF_REPEAT netfilter: nft_set_pipapo: store index in scratch maps netfilter: nft_set_pipapo: add helper to release pcpu scratch area netfilter: nft_set_pipapo: remove scratch_aligned pointer Jozsef Kadlecsik (1): netfilter: ipset: Missing gc cancellations fixed Pablo Neira Ayuso (7): netfilter: nft_compat: narrow down revision to unsigned 8-bits netfilter: nft_compat: reject unused compat flag netfilter: nft_compat: restrict match/target protocol to u16 netfilter: nft_set_pipapo: remove static in nft_pipapo_get() netfilter: nft_ct: reject direction for ct id netfilter: nf_tables: use timestamp to check for set element timeout netfilter: nft_set_rbtree: skip end interval element from gc include/net/netfilter/nf_tables.h | 16 ++- include/uapi/linux/netfilter/nf_tables.h | 2 + net/netfilter/ipset/ip_set_core.c | 2 + net/netfilter/ipset/ip_set_hash_gen.h | 4 +- net/netfilter/nf_conntrack_netlink.c | 12 +- net/netfilter/nf_tables_api.c | 4 +- net/netfilter/nfnetlink_queue.c | 13 ++- net/netfilter/nft_compat.c | 17 ++- net/netfilter/nft_ct.c | 3 + net/netfilter/nft_set_hash.c | 8 +- net/netfilter/nft_set_pipapo.c | 127 +++++++++++---------- net/netfilter/nft_set_pipapo.h | 18 ++- net/netfilter/nft_set_pipapo_avx2.c | 17 ++- net/netfilter/nft_set_rbtree.c | 17 +-- .../selftests/netfilter/conntrack_dump_flush.c | 43 ++++++- 15 files changed, 201 insertions(+), 102 deletions(-)