Support resetting rules' state
Subsystems (2)
Phil Sutter
reviewercover Support resetting rules' state
In order to "zero" a rule (in the 'iptables -Z' sense), users had to dump (parts of) the ruleset in stateless form and restore it again after removing the dumped parts.
Introduce a simpler method to reset any stateful elements of a rule or all rules of a chain/table/family. Affects both counter and quota expressions.
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 | 1 + net/ipv4/netfilter/nft_dup_ipv4.c | 3 +- net/ipv6/netfilter/nft_dup_ipv6.c | 3 +- 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_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 | 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 +- 45 files changed, 146 insertions(+), 81 deletions(-)
Signature · 1 line
2.34.1
Phil Sutter
reviewerPATCH 1/2 netfilter: nf_tables: Extend nft_expr_ops::dump callback parameters
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_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 +- 44 files changed, 108 insertions(+), 61 deletions(-)
include/net/netfilter/nf_tables.h +2 -1
@@ -921,7 +921,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_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);
@@ -156,7 +157,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
@@ -195,7 +195,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);
@@ -787,7 +788,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.34.1
Phil Sutter
reviewerPATCH 2/2 netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET
In reply to Phil SutterAnalogous 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 | 1 + net/netfilter/nf_tables_api.c | 49 ++++++++++++++++-------- net/netfilter/nft_counter.c | 2 +- net/netfilter/nft_dynset.c | 4 +- net/netfilter/nft_quota.c | 2 +- 6 files changed, 39 insertions(+), 21 deletions(-)
include/net/netfilter/nf_tables.h +1 -1
@@ -378,7 +378,7 @@ static inline void *nft_expr_priv(const struct nft_expr *expr)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 +1 -0
@@ -124,6 +124,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_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.34.1
Pablo Neira Ayuso
maintainerQuoted 7 lines · Phil Sutter
In order to "zero" a rule (in the 'iptables -Z' sense), users had to dump (parts of) the ruleset in stateless form and restore it again after removing the dumped parts.
Introduce a simpler method to reset any stateful elements of a rule or all rules of a chain/table/family. Affects both counter and quota expressions.
Patchset LGTM.
For the record, we agreed on the workshop to extend this to:
- add support for this command to table, chain and set objects too.
- validate that nft syntax is consistent from userspace with other existing commands (for example, list).
Thanks Phil.
Phil Sutter
reviewerHi Pablo,
Quoted 9 lines · Pablo Neira Ayuso
Quoted 7 lines · Phil Sutter
In order to "zero" a rule (in the 'iptables -Z' sense), users had to dump (parts of) the ruleset in stateless form and restore it again after removing the dumped parts.
Introduce a simpler method to reset any stateful elements of a rule or all rules of a chain/table/family. Affects both counter and quota expressions.
Quoted 7 lines
Patchset LGTM.
For the record, we agreed on the workshop to extend this to:
- add support for this command to table, chain and set objects too.
- validate that nft syntax is consistent from userspace with other existing commands (for example, list).
Looking into this, I wonder if it might cause confusion with regards to stateful objects:
My original patch implements:
- reset rule [<fam>] <table> <chain> handle <num>
- reset rules [<fam>]
- reset rules table [<fam>] <table>
- reset rules chain [<fam>] <table> <chain>
This is relatively consistent with list command, which (e.g.) has:
- list set [<fam>] <table> <set>
- list sets [<fam>]
- list sets table [<fam>] <table>
IIRC, your request at NFWS was to introduce something like:
- reset table (for 'reset rules table')
- reset chain (for 'reset rules chain')
But the first one may seem like resetting *all* state of a table, including named quotas, counters, etc. while in fact it only resets state in rules.
Cheers, Phil
Pablo Neira Ayuso
maintainerQuoted 30 lines · Phil Sutter
Hi Pablo,
Quoted 9 lines · Pablo Neira Ayuso
Quoted 7 lines · Phil Sutter
In order to "zero" a rule (in the 'iptables -Z' sense), users had to dump (parts of) the ruleset in stateless form and restore it again after removing the dumped parts.
Introduce a simpler method to reset any stateful elements of a rule or all rules of a chain/table/family. Affects both counter and quota expressions.
Quoted 7 lines
Patchset LGTM.
For the record, we agreed on the workshop to extend this to:
- add support for this command to table, chain and set objects too.
- validate that nft syntax is consistent from userspace with other existing commands (for example, list).Looking into this, I wonder if it might cause confusion with regards to stateful objects:
My original patch implements:
- reset rule [<fam>] <table> <chain> handle <num>
- reset rules [<fam>]
- reset rules table [<fam>] <table>
- reset rules chain [<fam>] <table> <chain>
Quoted 5 lines
This is relatively consistent with list command, which (e.g.) has:
- list set [<fam>] <table> <set>
- list sets [<fam>]
- list sets table [<fam>] <table>
This also looks consistent with stateful objects:
- reset counter [<fam>] <counter>
- reset counters table [<fam>] table <table>
- reset counters [<fam>]
Quoted 3 lines
IIRC, your request at NFWS was to introduce something like:
- reset table (for 'reset rules table')
This would require to make two calls, one to NFT_MSG_GETOBJ_RESET and another to NFT_MSG_GETRULE_RESET:
Quoted 1 line
- reset chain (for 'reset rules chain')
This could be implemented with the new NFT_MSG_GETRULE_RESET, which already allows to filter with chain.
So these two would only require userspace code, this can be done later.
Quoted 3 lines
But the first one may seem like resetting *all* state of a table, including named quotas, counters, etc. while in fact it only resets state in rules.
Yes, first should reset everything that is stateful and that is contained in the table.
As said, this can be implemented later on from userspace.
This is addressing all my questions then, I'm going to put this into nf-next.
Thanks for explaining.
Phil Sutter
reviewerQuoted 1 line · Pablo Neira Ayuso
On Tue, Nov 08, 2022 at 05:49:25PM +0100, Phil Sutter wrote:
[...]
Quoted 6 lines
Quoted 3 lines
IIRC, your request at NFWS was to introduce something like:
- reset table (for 'reset rules table')
This would require to make two calls, one to
NFT_MSG_GETOBJ_RESETand another toNFT_MSG_GETRULE_RESET:
Ah yes, there is NFT_OBJECT_UNSPEC which should allow to reset all kinds of objects at once.
Quoted 4 lines
Quoted 1 line
- reset chain (for 'reset rules chain')
This could be implemented with the new
NFT_MSG_GETRULE_RESET, which already allows to filter with chain.
Yes, it would just be an alias for 'reset rules chain'.
Quoted 2 lines
So these two would only require userspace code, this can be done later.
ACK.
Quoted 11 lines
Quoted 3 lines
But the first one may seem like resetting *all* state of a table, including named quotas, counters, etc. while in fact it only resets state in rules.
Yes, first should reset everything that is stateful and that is contained in the table.
As said, this can be implemented later on from userspace.
This is addressing all my questions then, I'm going to put this into nf-next.
Cool, thanks!
Cheers, Phil