Netfilter updates for net-next
Subsystems (3)
Pablo Neira Ayuso
maintainerv2 cover Netfilter updates for net-next
Hi,
The following patchset contains Netfilter updates for net-next:
1) Fix sparse warning in the new nft_inner expression, reported by Jakub Kicinski.
2) Incorrect vlan header check in nft_inner, from Peng Wu.
3) Two patches to pass reset boolean to expression dump operation, in preparation for allowing to reset stateful expressions in rules. This adds a new NFT_MSG_GETRULE_RESET command. From Phil Sutter.
4) Inconsistent indentation in nft_fib, from Jiapeng Chong.
5) Speed up siphash calculation in conntrack, from Florian Westphal.
This batch includes two fixes for the new inner payload/meta match coming in the previous nf-next pull request.
Coming in this v2 after Jakub's comments:
- sparse looks now clean after siphash conntrack update.
- no more bisectability breakage in new NFT_MSG_GETRULE_RESET command.
Please, pull these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git
Thanks.
----------------------------------------------------------------
The following changes since commit 6f1a298b2e24c703bfcc643e41bc7c0604fe4830:
Merge branch 'inet-add-drop-monitor-support' (2022-10-31 20:14:30 -0700)
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 d2c806abcf0b582131e1f93589d628dac0c07bf4:
netfilter: conntrack: use siphash_4u64 (2022-11-15 10:53:19 +0100)
----------------------------------------------------------------
Florian Westphal (1):
netfilter: conntrack: use siphash_4u64
Jiapeng Chong (1):
netfilter: rpfilter/fib: clean up some inconsistent indenting
Pablo Neira Ayuso (1):
netfilter: nft_payload: use __be16 to store gre version
Peng Wu (1):
netfilter: nft_inner: fix return value check in nft_inner_parse_l2l3()
Phil Sutter (2):
netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters
netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET
include/net/netfilter/nf_tables.h | 5 ++-- include/net/netfilter/nft_fib.h | 2 +- include/net/netfilter/nft_meta.h | 4 +-- include/net/netfilter/nft_reject.h | 3 +- include/uapi/linux/netfilter/nf_tables.h | 2 ++ net/ipv4/netfilter/nft_dup_ipv4.c | 3 +- net/ipv4/netfilter/nft_fib_ipv4.c | 5 ++-- net/ipv6/netfilter/nft_dup_ipv6.c | 3 +- net/netfilter/nf_conntrack_core.c | 30 +++++++++---------- net/netfilter/nf_tables_api.c | 49 +++++++++++++++++++++----------- net/netfilter/nft_bitwise.c | 6 ++-- net/netfilter/nft_byteorder.c | 3 +- net/netfilter/nft_cmp.c | 9 ++++-- net/netfilter/nft_compat.c | 9 ++++-- net/netfilter/nft_connlimit.c | 3 +- net/netfilter/nft_counter.c | 5 ++-- net/netfilter/nft_ct.c | 6 ++-- net/netfilter/nft_dup_netdev.c | 3 +- net/netfilter/nft_dynset.c | 7 +++-- net/netfilter/nft_exthdr.c | 9 ++++-- net/netfilter/nft_fib.c | 2 +- net/netfilter/nft_flow_offload.c | 3 +- net/netfilter/nft_fwd_netdev.c | 6 ++-- net/netfilter/nft_hash.c | 4 +-- net/netfilter/nft_immediate.c | 3 +- net/netfilter/nft_inner.c | 7 +++-- net/netfilter/nft_last.c | 3 +- net/netfilter/nft_limit.c | 5 ++-- net/netfilter/nft_log.c | 3 +- net/netfilter/nft_lookup.c | 3 +- net/netfilter/nft_masq.c | 3 +- net/netfilter/nft_meta.c | 5 ++-- net/netfilter/nft_nat.c | 3 +- net/netfilter/nft_numgen.c | 6 ++-- net/netfilter/nft_objref.c | 6 ++-- net/netfilter/nft_osf.c | 3 +- net/netfilter/nft_payload.c | 9 ++++-- net/netfilter/nft_queue.c | 6 ++-- net/netfilter/nft_quota.c | 5 ++-- net/netfilter/nft_range.c | 3 +- net/netfilter/nft_redir.c | 3 +- net/netfilter/nft_reject.c | 3 +- net/netfilter/nft_rt.c | 2 +- net/netfilter/nft_socket.c | 2 +- net/netfilter/nft_synproxy.c | 3 +- net/netfilter/nft_tproxy.c | 2 +- net/netfilter/nft_tunnel.c | 2 +- net/netfilter/nft_xfrm.c | 2 +- 48 files changed, 168 insertions(+), 105 deletions(-)
Pablo Neira Ayuso
maintainerPATCH v2 1/6 netfilter: nft_payload: use __be16 to store gre version
GRE_VERSION and GRE_VERSION0 are expressed in network byte order, use __be16. Uncovered by sparse:
net/netfilter/nft_payload.c:112:25: warning: incorrect type in assignment (different base types)net/netfilter/nft_payload.c:112:25: expected unsigned int [usertype] versionnet/netfilter/nft_payload.c:112:25: got restricted __be16net/netfilter/nft_payload.c:114:22: warning: restricted __be16 degrades to integer
--- net/netfilter/nft_payload.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netfilter/nft_payload.c +2 -1
@@ -102,8 +102,9 @@ static int __nft_payload_inner_offset(struct nft_pktinfo *pkt) }break ;case IPPROTO_GRE : { -u32 offset =sizeof (struct gre_base_hdr ), version; +u32 offset =sizeof (struct gre_base_hdr );struct gre_base_hdr *gre, _gre; +__be16 version; gre =skb_header_pointer (pkt->skb, thoff,sizeof (_gre), &_gre);if (!gre)
Signature · 1 line
2.30.2
Re: [PATCH net-next 1/6] netfilter: nft_payload: use __be16 to store gre version
This series was applied to netdev/net-next.git (master) by Pablo Neira Ayuso <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Pablo Neira Ayuso <[email protected]>:
Quoted 9 lines · On Tue, 15 Nov 2022 10:59:17 +0100 you wrote:
GRE_VERSIONandGRE_VERSION0are expressed in network byte order, use__be16. Uncovered by sparse:
net/netfilter/nft_payload.c:112:25: warning: incorrect type in assignment (different base types)net/netfilter/nft_payload.c:112:25: expected unsigned int [usertype] versionnet/netfilter/nft_payload.c:112:25: got restricted__be16net/netfilter/nft_payload.c:114:22: warning: restricted__be16degrades to integer[...]
Here is the summary with links:
- [net-next,1/6] netfilter: nft_payload: use __be16 to store gre version
https://git.kernel.org/netdev/net-next/c/66394126bf20 - [net-next,2/6] netfilter: nft_inner: fix return value check in nft_inner_parse_l2l3() https://git.kernel.org/netdev/net-next/c/7394c2dd62de - [net-next,3/6] netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters https://git.kernel.org/netdev/net-next/c/7d34aa3e03b6 - [net-next,4/6] netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET https://git.kernel.org/netdev/net-next/c/8daa8fde3fc3 - [net-next,5/6] netfilter: rpfilter/fib: clean up some inconsistent indenting https://git.kernel.org/netdev/net-next/c/971095c6fa4a - [net-next,6/6] netfilter: conntrack: use siphash_4u64 https://git.kernel.org/netdev/net-next/c/d2c806abcf0b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
Pablo Neira Ayuso
maintainerPATCH v2 2/6 netfilter: nft_inner: fix return value check in nft_inner_parse_l2l3()
In reply to Pablo Neira AyusoFrom: Peng Wu <[email protected]>
In nft_inner_parse_l2l3(), the return value of skb_header_pointer() is 'veth' instead of 'eth' when case 'htons(ETH_P_8021Q)' and fix it.
--- net/netfilter/nft_inner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_inner.c +1 -1
@@ -72,7 +72,7 @@ static int nft_inner_parse_l2l3(const struct nft_inner *priv,break ;case htons (ETH_P_8021Q ): veth =skb_header_pointer (pkt->skb, off,sizeof (_veth), &_veth); -if (!eth) +if (!veth)return -1 ; outer_llproto = veth->h_vlan_encapsulated_proto;
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 3/6 netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters
In reply to Pablo Neira AyusoFrom: Phil Sutter <[email protected]>
Add a 'reset' flag just like with nft_object_ops::dump. This will be useful to reset "anonymous stateful objects", e.g. simple rule counters.
No functional change intended.
--- include/net/netfilter/nf_tables.h | 3 ++- include/net/netfilter/nft_fib.h | 2 +- include/net/netfilter/nft_meta.h | 4 ++-- include/net/netfilter/nft_reject.h | 3 ++- net/ipv4/netfilter/nft_dup_ipv4.c | 3 ++- net/ipv6/netfilter/nft_dup_ipv6.c | 3 ++- net/netfilter/nf_tables_api.c | 2 +- net/netfilter/nft_bitwise.c | 6 ++++-- net/netfilter/nft_byteorder.c | 3 ++- net/netfilter/nft_cmp.c | 9 ++++++--- net/netfilter/nft_compat.c | 9 ++++++--- net/netfilter/nft_connlimit.c | 3 ++- net/netfilter/nft_counter.c | 3 ++- net/netfilter/nft_ct.c | 6 ++++-- net/netfilter/nft_dup_netdev.c | 3 ++- net/netfilter/nft_dynset.c | 3 ++- net/netfilter/nft_exthdr.c | 9 ++++++--- net/netfilter/nft_fib.c | 2 +- net/netfilter/nft_flow_offload.c | 3 ++- net/netfilter/nft_fwd_netdev.c | 6 ++++-- net/netfilter/nft_hash.c | 4 ++-- net/netfilter/nft_immediate.c | 3 ++- net/netfilter/nft_inner.c | 3 ++- net/netfilter/nft_last.c | 3 ++- net/netfilter/nft_limit.c | 5 +++-- net/netfilter/nft_log.c | 3 ++- net/netfilter/nft_lookup.c | 3 ++- net/netfilter/nft_masq.c | 3 ++- net/netfilter/nft_meta.c | 5 +++-- net/netfilter/nft_nat.c | 3 ++- net/netfilter/nft_numgen.c | 6 ++++-- net/netfilter/nft_objref.c | 6 ++++-- net/netfilter/nft_osf.c | 3 ++- net/netfilter/nft_payload.c | 6 ++++-- net/netfilter/nft_queue.c | 6 ++++-- net/netfilter/nft_quota.c | 3 ++- net/netfilter/nft_range.c | 3 ++- net/netfilter/nft_redir.c | 3 ++- net/netfilter/nft_reject.c | 3 ++- net/netfilter/nft_rt.c | 2 +- net/netfilter/nft_socket.c | 2 +- net/netfilter/nft_synproxy.c | 3 ++- net/netfilter/nft_tproxy.c | 2 +- net/netfilter/nft_tunnel.c | 2 +- net/netfilter/nft_xfrm.c | 2 +- 45 files changed, 110 insertions(+), 62 deletions(-)
include/net/netfilter/nf_tables.h +2 -1
@@ -927,7 +927,8 @@ struct nft_expr_ops {void (*destroy_clone)(const struct nft_ctx *ctx,const struct nft_expr *expr);int (*dump)(struct sk_buff *skb, -const struct nft_expr *expr); +const struct nft_expr *expr, +bool reset);int (*validate)(const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nft_data **data);
include/net/netfilter/nft_fib.h +1 -1
@@ -18,7 +18,7 @@ nft_fib_is_loopback(const struct sk_buff *skb, const struct net_device *in)return skb->pkt_type ==PACKET_LOOPBACK || in->flags &IFF_LOOPBACK ; } -int nft_fib_dump (struct sk_buff *skb,const struct nft_expr *expr); +int nft_fib_dump (struct sk_buff *skb,const struct nft_expr *expr,bool reset);int nft_fib_init (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nlattr *const tb[]); int nft_fib_validate(const struct nft_ctx *ctx, const struct nft_expr *expr,
include/net/netfilter/nft_meta.h +2 -2
@@ -24,10 +24,10 @@ int nft_meta_set_init(const struct nft_ctx *ctx, const struct nlattr * const tb[]);int nft_meta_get_dump (struct sk_buff *skb, -const struct nft_expr *expr); +const struct nft_expr *expr,bool reset);int nft_meta_set_dump (struct sk_buff *skb, -const struct nft_expr *expr); +const struct nft_expr *expr,bool reset); void nft_meta_get_eval(const struct nft_expr *expr, struct nft_regs *regs,
include/net/netfilter/nft_reject.h +2 -1
@@ -22,7 +22,8 @@ int nft_reject_init(const struct nft_ctx *ctx,const struct nft_expr *expr, const struct nlattr * const tb[]); -int nft_reject_dump (struct sk_buff *skb,const struct nft_expr *expr); +int nft_reject_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset);int nft_reject_icmp_code (u8 code);int nft_reject_icmpv6_code (u8 code);
net/ipv4/netfilter/nft_dup_ipv4.c +2 -1
@@ -52,7 +52,8 @@ static int nft_dup_ipv4_init(const struct nft_ctx *ctx,return err; } -static int nft_dup_ipv4_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_dup_ipv4_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_dup_ipv4 *priv =nft_expr_priv (expr);
net/ipv6/netfilter/nft_dup_ipv6.c +2 -1
@@ -50,7 +50,8 @@ static int nft_dup_ipv6_init(const struct nft_ctx *ctx,return err; } -static int nft_dup_ipv6_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_dup_ipv6_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_dup_ipv6 *priv =nft_expr_priv (expr);
net/netfilter/nf_tables_api.c +1 -1
@@ -2769,7 +2769,7 @@ static int nf_tables_fill_expr_info(struct sk_buff *skb, NFTA_EXPR_DATA);if (data ==NULL ) goto nla_put_failure; -if (expr->ops->dump (skb, expr) <0 ) +if (expr->ops->dump (skb, expr, false) <0 ) goto nla_put_failure;nla_nest_end (skb, data); }
net/netfilter/nft_bitwise.c +4 -2
@@ -232,7 +232,8 @@ static int nft_bitwise_dump_shift(struct sk_buff *skb,return 0 ; } -static int nft_bitwise_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_bitwise_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_bitwise *priv =nft_expr_priv (expr);int err =0 ;
@@ -393,7 +394,8 @@ static int nft_bitwise_fast_init(const struct nft_ctx *ctx, }static int -nft_bitwise_fast_dump (struct sk_buff *skb,const struct nft_expr *expr) +nft_bitwise_fast_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_bitwise_fast_expr *priv =nft_expr_priv (expr);struct nft_data data;
net/netfilter/nft_byteorder.c +2 -1
@@ -148,7 +148,8 @@ static int nft_byteorder_init(const struct nft_ctx *ctx, priv->len); } -static int nft_byteorder_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_byteorder_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_byteorder *priv =nft_expr_priv (expr);
net/netfilter/nft_cmp.c +6 -3
@@ -92,7 +92,8 @@ static int nft_cmp_init(const struct nft_ctx *ctx, const struct nft_expr *expr,return 0 ; } -static int nft_cmp_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_cmp_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_cmp_expr *priv =nft_expr_priv (expr);
@@ -253,7 +254,8 @@ static int nft_cmp_fast_offload(struct nft_offload_ctx *ctx,return __nft_cmp_offload (ctx, flow, &cmp); } -static int nft_cmp_fast_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_cmp_fast_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_cmp_fast_expr *priv =nft_expr_priv (expr);enum nft_cmp_ops op = priv->inv ?NFT_CMP_NEQ :NFT_CMP_EQ ;
@@ -347,7 +349,8 @@ static int nft_cmp16_fast_offload(struct nft_offload_ctx *ctx,return __nft_cmp_offload (ctx, flow, &cmp); } -static int nft_cmp16_fast_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_cmp16_fast_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_cmp16_fast_expr *priv =nft_expr_priv (expr);enum nft_cmp_ops op = priv->inv ?NFT_CMP_NEQ :NFT_CMP_EQ ;
net/netfilter/nft_compat.c +6 -3
@@ -324,7 +324,8 @@ static int nft_extension_dump_info(struct sk_buff *skb, int attr,return 0 ; } -static int nft_target_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_target_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct xt_target *target = expr->ops->data;void *info =nft_expr_priv (expr);
@@ -572,12 +573,14 @@ static int __nft_match_dump(struct sk_buff *skb, const struct nft_expr *expr,return -1 ; } -static int nft_match_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_match_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {return __nft_match_dump (skb, expr,nft_expr_priv (expr)); } -static int nft_match_large_dump (struct sk_buff *skb,const struct nft_expr *e) +static int nft_match_large_dump (struct sk_buff *skb, +const struct nft_expr *e,bool reset) {struct nft_xt_match_priv *priv =nft_expr_priv (e);
net/netfilter/nft_connlimit.c +2 -1
@@ -185,7 +185,8 @@ static void nft_connlimit_eval(const struct nft_expr *expr,nft_connlimit_do_eval (priv, regs, pkt,NULL ); } -static int nft_connlimit_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_connlimit_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_connlimit *priv =nft_expr_priv (expr);
net/netfilter/nft_counter.c +2 -1
@@ -201,7 +201,8 @@ void nft_counter_eval(const struct nft_expr *expr, struct nft_regs *regs,nft_counter_do_eval (priv, regs, pkt); } -static int nft_counter_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_counter_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_counter_percpu_priv *priv =nft_expr_priv (expr);
net/netfilter/nft_ct.c +4 -2
@@ -641,7 +641,8 @@ static void nft_ct_set_destroy(const struct nft_ctx *ctx,nf_ct_netns_put (ctx->net, ctx->family); } -static int nft_ct_get_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_ct_get_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_ct *priv =nft_expr_priv (expr);
@@ -703,7 +704,8 @@ static bool nft_ct_get_reduce(struct nft_regs_track *track,return nft_expr_reduce_bitwise (track, expr); } -static int nft_ct_set_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_ct_set_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_ct *priv =nft_expr_priv (expr);
net/netfilter/nft_dup_netdev.c +2 -1
@@ -44,7 +44,8 @@ static int nft_dup_netdev_init(const struct nft_ctx *ctx, sizeof(int)); } -static int nft_dup_netdev_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_dup_netdev_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_dup_netdev *priv =nft_expr_priv (expr);
net/netfilter/nft_dynset.c +2 -1
@@ -357,7 +357,8 @@ static void nft_dynset_destroy(const struct nft_ctx *ctx,nf_tables_destroy_set (ctx, priv->set); } -static int nft_dynset_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_dynset_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_dynset *priv =nft_expr_priv (expr);u32 flags = priv->invert ?NFT_DYNSET_F_INV :0 ;
net/netfilter/nft_exthdr.c +6 -3
@@ -576,7 +576,8 @@ static int nft_exthdr_dump_common(struct sk_buff *skb, const struct nft_exthdr *return -1 ; } -static int nft_exthdr_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_exthdr_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_exthdr *priv =nft_expr_priv (expr);
@@ -586,7 +587,8 @@ static int nft_exthdr_dump(struct sk_buff *skb, const struct nft_expr *expr)return nft_exthdr_dump_common (skb, priv); } -static int nft_exthdr_dump_set (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_exthdr_dump_set (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_exthdr *priv =nft_expr_priv (expr);
@@ -596,7 +598,8 @@ static int nft_exthdr_dump_set(struct sk_buff *skb, const struct nft_expr *expr)return nft_exthdr_dump_common (skb, priv); } -static int nft_exthdr_dump_strip (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_exthdr_dump_strip (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_exthdr *priv =nft_expr_priv (expr);
net/netfilter/nft_fib.c +1 -1
@@ -118,7 +118,7 @@ int nft_fib_init(const struct nft_ctx *ctx, const struct nft_expr *expr, }EXPORT_SYMBOL_GPL (nft_fib_init); -int nft_fib_dump (struct sk_buff *skb,const struct nft_expr *expr) +int nft_fib_dump (struct sk_buff *skb,const struct nft_expr *expr,bool reset) {const struct nft_fib *priv =nft_expr_priv (expr);
net/netfilter/nft_flow_offload.c +2 -1
@@ -433,7 +433,8 @@ static void nft_flow_offload_destroy(const struct nft_ctx *ctx,nf_ct_netns_put (ctx->net, ctx->family); } -static int nft_flow_offload_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_flow_offload_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_flow_offload *priv =nft_expr_priv (expr);
net/netfilter/nft_fwd_netdev.c +4 -2
@@ -56,7 +56,8 @@ static int nft_fwd_netdev_init(const struct nft_ctx *ctx, sizeof(int)); } -static int nft_fwd_netdev_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_fwd_netdev_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_fwd_netdev *priv =nft_expr_priv (expr);
@@ -186,7 +187,8 @@ static int nft_fwd_neigh_init(const struct nft_ctx *ctx, addr_len); } -static int nft_fwd_neigh_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_fwd_neigh_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_fwd_neigh *priv =nft_expr_priv (expr);
net/netfilter/nft_hash.c +2 -2
@@ -139,7 +139,7 @@ static int nft_symhash_init(const struct nft_ctx *ctx, }static int nft_jhash_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_jhash *priv =nft_expr_priv (expr);
@@ -176,7 +176,7 @@ static bool nft_jhash_reduce(struct nft_regs_track *track, }static int nft_symhash_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_symhash *priv =nft_expr_priv (expr);
net/netfilter/nft_immediate.c +2 -1
@@ -147,7 +147,8 @@ static void nft_immediate_destroy(const struct nft_ctx *ctx, } } -static int nft_immediate_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_immediate_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_immediate_expr *priv =nft_expr_priv (expr);
net/netfilter/nft_inner.c +2 -1
@@ -347,7 +347,8 @@ static int nft_inner_init(const struct nft_ctx *ctx,return 0 ; } -static int nft_inner_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_inner_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_inner *priv =nft_expr_priv (expr);
net/netfilter/nft_last.c +2 -1
@@ -65,7 +65,8 @@ static void nft_last_eval(const struct nft_expr *expr,WRITE_ONCE (last->set,1 ); } -static int nft_last_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_last_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_last_priv *priv =nft_expr_priv (expr);struct nft_last *last = priv->last;
net/netfilter/nft_limit.c +3 -2
@@ -193,7 +193,8 @@ static int nft_limit_pkts_init(const struct nft_ctx *ctx,return 0 ; } -static int nft_limit_pkts_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_limit_pkts_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_limit_priv_pkts *priv =nft_expr_priv (expr);
@@ -251,7 +252,7 @@ static int nft_limit_bytes_init(const struct nft_ctx *ctx, }static int nft_limit_bytes_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_limit_priv *priv =nft_expr_priv (expr);
net/netfilter/nft_log.c +2 -1
@@ -241,7 +241,8 @@ static void nft_log_destroy(const struct nft_ctx *ctx,nf_logger_put (ctx->family, li->type); } -static int nft_log_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_log_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_log *priv =nft_expr_priv (expr);const struct nf_loginfo *li = &priv->loginfo;
net/netfilter/nft_lookup.c +2 -1
@@ -178,7 +178,8 @@ static void nft_lookup_destroy(const struct nft_ctx *ctx,nf_tables_destroy_set (ctx, priv->set); } -static int nft_lookup_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_lookup_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_lookup *priv =nft_expr_priv (expr);u32 flags = priv->invert ?NFT_LOOKUP_F_INV :0 ;
net/netfilter/nft_masq.c +2 -1
@@ -73,7 +73,8 @@ static int nft_masq_init(const struct nft_ctx *ctx,return nf_ct_netns_get (ctx->net, ctx->family); } -static int nft_masq_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_masq_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_masq *priv =nft_expr_priv (expr);
net/netfilter/nft_meta.c +3 -2
@@ -669,7 +669,7 @@ int nft_meta_set_init(const struct nft_ctx *ctx,EXPORT_SYMBOL_GPL (nft_meta_set_init);int nft_meta_get_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_meta *priv =nft_expr_priv (expr);
@@ -684,7 +684,8 @@ int nft_meta_get_dump(struct sk_buff *skb, }EXPORT_SYMBOL_GPL (nft_meta_get_dump); -int nft_meta_set_dump (struct sk_buff *skb,const struct nft_expr *expr) +int nft_meta_set_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_meta *priv =nft_expr_priv (expr);
net/netfilter/nft_nat.c +2 -1
@@ -255,7 +255,8 @@ static int nft_nat_init(const struct nft_ctx *ctx, const struct nft_expr *expr,return nf_ct_netns_get (ctx->net, family); } -static int nft_nat_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_nat_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_nat *priv =nft_expr_priv (expr);
net/netfilter/nft_numgen.c +4 -2
@@ -112,7 +112,8 @@ static int nft_ng_dump(struct sk_buff *skb, enum nft_registers dreg,return -1 ; } -static int nft_ng_inc_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_ng_inc_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_ng_inc *priv =nft_expr_priv (expr);
@@ -168,7 +169,8 @@ static int nft_ng_random_init(const struct nft_ctx *ctx, NULL, NFT_DATA_VALUE, sizeof(u32)); } -static int nft_ng_random_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_ng_random_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_ng_random *priv =nft_expr_priv (expr);
net/netfilter/nft_objref.c +4 -2
@@ -47,7 +47,8 @@ static int nft_objref_init(const struct nft_ctx *ctx,return 0 ; } -static int nft_objref_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_objref_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_object *obj =nft_objref_priv (expr);
@@ -155,7 +156,8 @@ static int nft_objref_map_init(const struct nft_ctx *ctx,return 0 ; } -static int nft_objref_map_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_objref_map_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_objref_map *priv =nft_expr_priv (expr);
net/netfilter/nft_osf.c +2 -1
@@ -92,7 +92,8 @@ static int nft_osf_init(const struct nft_ctx *ctx,return 0 ; } -static int nft_osf_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_osf_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_osf *priv =nft_expr_priv (expr);
net/netfilter/nft_payload.c +4 -2
@@ -231,7 +231,8 @@ static int nft_payload_init(const struct nft_ctx *ctx, priv->len); } -static int nft_payload_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_payload_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_payload *priv =nft_expr_priv (expr);
@@ -919,7 +920,8 @@ static int nft_payload_set_init(const struct nft_ctx *ctx, priv->len); } -static int nft_payload_set_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_payload_set_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_payload_set *priv =nft_expr_priv (expr);
net/netfilter/nft_queue.c +4 -2
@@ -152,7 +152,8 @@ static int nft_queue_sreg_init(const struct nft_ctx *ctx,return 0 ; } -static int nft_queue_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_queue_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_queue *priv =nft_expr_priv (expr);
@@ -168,7 +169,8 @@ static int nft_queue_dump(struct sk_buff *skb, const struct nft_expr *expr) }static int -nft_queue_sreg_dump (struct sk_buff *skb,const struct nft_expr *expr) +nft_queue_sreg_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_queue *priv =nft_expr_priv (expr);
net/netfilter/nft_quota.c +2 -1
@@ -217,7 +217,8 @@ static int nft_quota_init(const struct nft_ctx *ctx,return nft_quota_do_init (tb, priv); } -static int nft_quota_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_quota_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_quota *priv =nft_expr_priv (expr);
net/netfilter/nft_range.c +2 -1
@@ -111,7 +111,8 @@ static int nft_range_init(const struct nft_ctx *ctx, const struct nft_expr *exprreturn err; } -static int nft_range_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_range_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_range_expr *priv =nft_expr_priv (expr);
net/netfilter/nft_redir.c +2 -1
@@ -75,7 +75,8 @@ static int nft_redir_init(const struct nft_ctx *ctx,return nf_ct_netns_get (ctx->net, ctx->family); } -static int nft_redir_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_redir_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_redir *priv =nft_expr_priv (expr);
net/netfilter/nft_reject.c +2 -1
@@ -69,7 +69,8 @@ int nft_reject_init(const struct nft_ctx *ctx, }EXPORT_SYMBOL_GPL (nft_reject_init); -int nft_reject_dump (struct sk_buff *skb,const struct nft_expr *expr) +int nft_reject_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {const struct nft_reject *priv =nft_expr_priv (expr);
net/netfilter/nft_rt.c +1 -1
@@ -146,7 +146,7 @@ static int nft_rt_get_init(const struct nft_ctx *ctx, }static int nft_rt_get_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_rt *priv =nft_expr_priv (expr);
net/netfilter/nft_socket.c +1 -1
@@ -199,7 +199,7 @@ static int nft_socket_init(const struct nft_ctx *ctx, }static int nft_socket_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_socket *priv =nft_expr_priv (expr);
net/netfilter/nft_synproxy.c +2 -1
@@ -272,7 +272,8 @@ static void nft_synproxy_destroy(const struct nft_ctx *ctx,nft_synproxy_do_destroy (ctx); } -static int nft_synproxy_dump (struct sk_buff *skb,const struct nft_expr *expr) +static int nft_synproxy_dump (struct sk_buff *skb, +const struct nft_expr *expr,bool reset) {struct nft_synproxy *priv =nft_expr_priv (expr);
net/netfilter/nft_tproxy.c +1 -1
@@ -294,7 +294,7 @@ static void nft_tproxy_destroy(const struct nft_ctx *ctx, }static int nft_tproxy_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_tproxy *priv =nft_expr_priv (expr);
net/netfilter/nft_tunnel.c +1 -1
@@ -108,7 +108,7 @@ static int nft_tunnel_get_init(const struct nft_ctx *ctx, }static int nft_tunnel_get_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_tunnel *priv =nft_expr_priv (expr);
net/netfilter/nft_xfrm.c +1 -1
@@ -212,7 +212,7 @@ static void nft_xfrm_get_eval(const struct nft_expr *expr, }static int nft_xfrm_get_dump (struct sk_buff *skb, -const struct nft_expr *expr) +const struct nft_expr *expr,bool reset) {const struct nft_xfrm *priv =nft_expr_priv (expr);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 4/6 netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET
In reply to Pablo Neira AyusoFrom: Phil Sutter <[email protected]>
Analogous to NFT_MSG_GETOBJ_RESET, but for rules: Reset stateful expressions like counters or quotas. The latter two are the only consumers, adjust their 'dump' callbacks to respect the parameter introduced earlier.
--- include/net/netfilter/nf_tables.h | 2 +- include/uapi/linux/netfilter/nf_tables.h | 2 + net/netfilter/nf_tables_api.c | 49 ++++++++++++++++-------- net/netfilter/nft_counter.c | 2 +- net/netfilter/nft_dynset.c | 4 +- net/netfilter/nft_inner.c | 2 +- net/netfilter/nft_quota.c | 2 +- 7 files changed, 41 insertions(+), 22 deletions(-)
include/net/netfilter/nf_tables.h +1 -1
@@ -383,7 +383,7 @@ int nft_expr_inner_parse(const struct nft_ctx *ctx, const struct nlattr *nla,int nft_expr_clone (struct nft_expr *dst,struct nft_expr *src);void nft_expr_destroy (const struct nft_ctx *ctx,struct nft_expr *expr);int nft_expr_dump (struct sk_buff *skb,unsigned int attr, -const struct nft_expr *expr); +const struct nft_expr *expr,bool reset);bool nft_expr_reduce_bitwise (struct nft_regs_track *track,const struct nft_expr *expr);
include/uapi/linux/netfilter/nf_tables.h +2 -0
@@ -97,6 +97,7 @@ enum nft_verdicts {* @NFT_MSG_NEWFLOWTABLE: add new flow table (enum nft_flowtable_attributes) * @NFT_MSG_GETFLOWTABLE: get flow table (enum nft_flowtable_attributes) * @NFT_MSG_DELFLOWTABLE: delete flow table (enum nft_flowtable_attributes) +* @NFT_MSG_GETRULE_RESET: get rules and reset stateful expressions (enum nft_obj_attributes) */ enum nf_tables_msg_types {NFT_MSG_NEWTABLE ,
@@ -124,6 +125,7 @@ enum nf_tables_msg_types {NFT_MSG_NEWFLOWTABLE ,NFT_MSG_GETFLOWTABLE ,NFT_MSG_DELFLOWTABLE , +NFT_MSG_GETRULE_RESET , NFT_MSG_MAX, };
net/netfilter/nf_tables_api.c +33 -16
165 lines not on this page · raw message
net/netfilter/nft_counter.c +1 -1
@@ -206,7 +206,7 @@ static int nft_counter_dump(struct sk_buff *skb, {struct nft_counter_percpu_priv *priv =nft_expr_priv (expr); -return nft_counter_do_dump (skb, priv, false); +return nft_counter_do_dump (skb, priv, reset); } static int nft_counter_init(const struct nft_ctx *ctx,
net/netfilter/nft_dynset.c +2 -2
@@ -380,7 +380,7 @@ static int nft_dynset_dump(struct sk_buff *skb,if (priv->set->num_exprs ==0 ) {if (priv->num_exprs ==1 ) {if (nft_expr_dump (skb,NFTA_DYNSET_EXPR , - priv->expr_array[0 ])) + priv->expr_array[0 ], reset)) goto nla_put_failure; }else if (priv->num_exprs >1 ) {struct nlattr *nest;
@@ -391,7 +391,7 @@ static int nft_dynset_dump(struct sk_buff *skb,for (i =0 ; i < priv->num_exprs; i++) {if (nft_expr_dump (skb,NFTA_LIST_ELEM , - priv->expr_array[i])) + priv->expr_array[i], reset)) goto nla_put_failure; }nla_nest_end (skb, nest);
net/netfilter/nft_inner.c +1 -1
@@ -359,7 +359,7 @@ static int nft_inner_dump(struct sk_buff *skb, goto nla_put_failure;if (nft_expr_dump (skb,NFTA_INNER_EXPR , - (struct nft_expr *)&priv->expr) <0 ) + (struct nft_expr *)&priv->expr, reset) <0 ) goto nla_put_failure;return 0 ;
net/netfilter/nft_quota.c +1 -1
@@ -222,7 +222,7 @@ static int nft_quota_dump(struct sk_buff *skb, {struct nft_quota *priv =nft_expr_priv (expr); -return nft_quota_do_dump (skb, priv, false); +return nft_quota_do_dump (skb, priv, reset); } static void nft_quota_destroy(const struct nft_ctx *ctx,
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 5/6 netfilter: rpfilter/fib: clean up some inconsistent indenting
In reply to Pablo Neira AyusoFrom: Jiapeng Chong <[email protected]>
No functional modification involved.
net/ipv4/netfilter/nft_fib_ipv4.c:141 nft_fib4_eval() warn: inconsistent indenting.
--- net/ipv4/netfilter/nft_fib_ipv4.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/ipv4/netfilter/nft_fib_ipv4.c +2 -3
@@ -138,12 +138,11 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,break ; } -if (!oif) { - found =FIB_RES_DEV (res); +if (!oif) { + found =FIB_RES_DEV (res); }else {if (!fib_info_nh_uses_dev (res.fi, oif))return ; - found = oif; }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 6/6 netfilter: conntrack: use siphash_4u64
In reply to Pablo Neira AyusoFrom: Florian Westphal <[email protected]>
This function is used for every packet, siphash_4u64 is noticeably faster than using local buffer + siphash:
Before:
1.23% kpktgend_0 [kernel.vmlinux] [k] __siphash_unaligned 0.14% kpktgend_0 [nf_conntrack] [k] hash_conntrack_raw After: 0.79% kpktgend_0 [kernel.vmlinux] [k] siphash_4u64 0.15% kpktgend_0 [nf_conntrack] [k] hash_conntrack_raw
In the pktgen test this gives about ~2.4% performance improvement.
--- net/netfilter/nf_conntrack_core.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
net/netfilter/nf_conntrack_core.c +13 -17
@@ -211,28 +211,24 @@ static u32 hash_conntrack_raw(const struct nf_conntrack_tuple *tuple,unsigned int zoneid, const struct net *net) { -struct { -struct nf_conntrack_man src; -union nf_inet_addr dst_addr; -unsigned int zone; -u32 net_mix; -u16 dport; -u16 proto; - }__aligned(SIPHASH_ALIGNMENT) combined; + u64 a, b, c, d;get_random_once (&nf_conntrack_hash_rnd,sizeof (nf_conntrack_hash_rnd)); -memset (&combined,0 ,sizeof (combined)); +/* The direction must be ignored, handle usable tuplehash members manually */ + a = (u64 )tuple->src.u3.all[0 ] <<32 | tuple->src.u3.all[3 ]; + b = (u64 )tuple->dst.u3.all[0 ] <<32 | tuple->dst.u3.all[3 ]; -/* The direction must be ignored, so handle usable members manually. */ - combined.src = tuple->src; - combined.dst_addr = tuple->dst.u3; - combined.zone = zoneid; - combined.net_mix =net_hash_mix (net); - combined.dport = (__force __u16 )tuple->dst.u.all; - combined.proto = tuple->dst.protonum; + c = (__force u64 )tuple->src.u.all <<32 | (__force u64 )tuple->dst.u.all <<16 ; + c |= tuple->dst.protonum; -return (u32 )siphash (&combined,sizeof (combined), &nf_conntrack_hash_rnd); + d = (u64 )zoneid <<32 |net_hash_mix (net); + +/* IPv4: u3.all[1,2,3] == 0 */ + c ^= (u64 )tuple->src.u3.all[1 ] <<32 | tuple->src.u3.all[2 ]; + d += (u64 )tuple->dst.u3.all[1 ] <<32 | tuple->dst.u3.all[2 ]; + +return (u32 )siphash_4u64 (a, b, c, d, &nf_conntrack_hash_rnd); }static u32 scale_hash (u32 hash)
Signature · 1 line
2.30.2