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.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 38e2b396e38a50225a0e48c1279306732edc6ab0..c557a57fb0f1d2648074c71cdef8970e91d2dd9b 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -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);

diff --git a/include/net/netfilter/nft_fib.h b/include/net/netfilter/nft_fib.h
index eed099eae672aad3c3bfc85f1ac25c91bbd22b44..167640b843ef8ac4e77cf46f5076fcfbaca9ae04 100644 (file)
--- a/include/net/netfilter/nft_fib.h
+++ b/include/net/netfilter/nft_fib.h
@@ -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,

diff --git a/include/net/netfilter/nft_meta.h b/include/net/netfilter/nft_meta.h
index f3a5285a511cf67f45c0a89e8610cb3f820c332a..ba1238f12a487a4ccc6ae4ee19661d1c4538de05 100644 (file)
--- a/include/net/netfilter/nft_meta.h
+++ b/include/net/netfilter/nft_meta.h
@@ -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,

diff --git a/include/net/netfilter/nft_reject.h b/include/net/netfilter/nft_reject.h
index 56b123a42220e01b0aaec1ed100d0d3f00230751..6d9ba62efd7504cb8d521b3736133e704f1ea01a 100644 (file)
--- a/include/net/netfilter/nft_reject.h
+++ b/include/net/netfilter/nft_reject.h
@@ -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);

diff --git a/net/ipv4/netfilter/nft_dup_ipv4.c b/net/ipv4/netfilter/nft_dup_ipv4.c
index 0bcd6aee60008c6742f942d7a465516504da5a34..a522c3a3be5234837cd0f6dd7ad51364bfc63faa 100644 (file)
--- a/net/ipv4/netfilter/nft_dup_ipv4.c
+++ b/net/ipv4/netfilter/nft_dup_ipv4.c
@@ -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);
 

diff --git a/net/ipv6/netfilter/nft_dup_ipv6.c b/net/ipv6/netfilter/nft_dup_ipv6.c
index 70a405b4006f9681e49bb9265c56ea569e802f53..c82f3fdd4a65deed0970ee4949fc60b3b164efe5 100644 (file)
--- a/net/ipv6/netfilter/nft_dup_ipv6.c
+++ b/net/ipv6/netfilter/nft_dup_ipv6.c
@@ -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);
 

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 62da204eed41e665e6e7849083b561de671734c5..741a0e38640648b11098086c4ce656648cb1089b 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -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);
        }

diff --git a/net/netfilter/nft_bitwise.c b/net/netfilter/nft_bitwise.c
index e6e402b247d0977f7b85bbfeef18b4c59556079f..84eae7cabc67a6a4c26b3994ba902d65c328a7c6 100644 (file)
--- a/net/netfilter/nft_bitwise.c
+++ b/net/netfilter/nft_bitwise.c
@@ -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;

diff --git a/net/netfilter/nft_byteorder.c b/net/netfilter/nft_byteorder.c
index f952a80275a81a98fc96cbf3e869cc0ec6042c84..b66647a5a17175941ad3d7c28f4259534a822d61 100644 (file)
--- a/net/netfilter/nft_byteorder.c
+++ b/net/netfilter/nft_byteorder.c
@@ -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);
 

diff --git a/net/netfilter/nft_cmp.c b/net/netfilter/nft_cmp.c
index 963cf831799cdb6992f52bdb3cdd056c08be37cc..6eb21a4f5698921ee73487b14a6d0097d5e053af 100644 (file)
--- a/net/netfilter/nft_cmp.c
+++ b/net/netfilter/nft_cmp.c
@@ -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;

diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
index c16172427622e4f87eaf82f110b1994f3f92c800..5284cd2ad532713368db0cd56bdf17baf1e0ed4d 100644 (file)
--- a/net/netfilter/nft_compat.c
+++ b/net/netfilter/nft_compat.c
@@ -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 @@ nla_put_failure:
        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);
 

diff --git a/net/netfilter/nft_connlimit.c b/net/netfilter/nft_connlimit.c
index d657f999a11b6fd68d07a790259b3b4e8f92d9d1..de9d1980df6964b3b0da99560acce8ce9b5a2aa7 100644 (file)
--- a/net/netfilter/nft_connlimit.c
+++ b/net/netfilter/nft_connlimit.c
@@ -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);
 

diff --git a/net/netfilter/nft_counter.c b/net/netfilter/nft_counter.c
index f4d3573e8782d2a69a63cc9438bfb1a39c105432..06482fb9c14572b5e3be29ecd075e966b172760a 100644 (file)
--- a/net/netfilter/nft_counter.c
+++ b/net/netfilter/nft_counter.c
@@ -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);
 

diff --git a/net/netfilter/nft_ct.c b/net/netfilter/nft_ct.c
index a3f01f209a53383ade9f9322601dc9e5f56deb4f..a0696d7ea10cc1fce79c5ef9519dc6edf6f6694d 100644 (file)
--- a/net/netfilter/nft_ct.c
+++ b/net/netfilter/nft_ct.c
@@ -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);
 

diff --git a/net/netfilter/nft_dup_netdev.c b/net/netfilter/nft_dup_netdev.c
index 63507402716d1ad813f98c78190923434fec82ae..e5739a59ebf10c846446c34ec27740d60b042d15 100644 (file)
--- a/net/netfilter/nft_dup_netdev.c
+++ b/net/netfilter/nft_dup_netdev.c
@@ -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);
 

diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c
index 6983e6ddeef904268e370d38b38e9ec69f40f91c..01c61e090639d727498b179d12f5c8cdd2d80742 100644 (file)
--- a/net/netfilter/nft_dynset.c
+++ b/net/netfilter/nft_dynset.c
@@ -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;

diff --git a/net/netfilter/nft_exthdr.c b/net/netfilter/nft_exthdr.c
index a67ea9c3ae57ddaca318c1ab31c2aa5b30278492..ed929d0d37ce07e186804cdd0aec5f83465782b6 100644 (file)
--- a/net/netfilter/nft_exthdr.c
+++ b/net/netfilter/nft_exthdr.c
@@ -576,7 +576,8 @@ nla_put_failure:
        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);
 

diff --git a/net/netfilter/nft_fib.c b/net/netfilter/nft_fib.c
index 1f12d7ade606c89496de381ba43b01addedac2f9..6e049fd48760b5d5bc3b6094a070cf63180460cd 100644 (file)
--- a/net/netfilter/nft_fib.c
+++ b/net/netfilter/nft_fib.c
@@ -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);
 

diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index a25c88bc8b7504618af99323013ffbf7324fef1d..e860d8fe0e5e2fd8fe1684032a06cee1ac63c9c6 100644 (file)
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -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);
 

diff --git a/net/netfilter/nft_fwd_netdev.c b/net/netfilter/nft_fwd_netdev.c
index 7c5876dc9ff2b51f4d2b0124b39b99419c5c8885..7b9d4d1bd17c8b351d2dc3d4b56295ecd40b2512 100644 (file)
--- a/net/netfilter/nft_fwd_netdev.c
+++ b/net/netfilter/nft_fwd_netdev.c
@@ -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);
 

diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index e5631e88b285ca724506b682628453743c358d3d..ee8d487b69c0d743b80d279295cfb58517a1a5cc 100644 (file)
--- a/net/netfilter/nft_hash.c
+++ b/net/netfilter/nft_hash.c
@@ -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);
 

diff --git a/net/netfilter/nft_immediate.c b/net/netfilter/nft_immediate.c
index 5f28b21abc7dfa313e68ad34fb5764df0117a815..c9d2f7c29f5304728c5ce02d8f83b837f7582457 100644 (file)
--- a/net/netfilter/nft_immediate.c
+++ b/net/netfilter/nft_immediate.c
@@ -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);
 

diff --git a/net/netfilter/nft_inner.c b/net/netfilter/nft_inner.c
index 809f0d0787ec2f7a82bf285bd81a7d0fff364b79..6d96b826db4e3f285de1cde39a88215bf6ed5a45 100644 (file)
--- a/net/netfilter/nft_inner.c
+++ b/net/netfilter/nft_inner.c
@@ -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);
 

diff --git a/net/netfilter/nft_last.c b/net/netfilter/nft_last.c
index bb15a55dad5c018a0b18876e72c11d1d12b9e80c..7f2bda6641bd8a22566b7f2e910e87324cbecace 100644 (file)
--- a/net/netfilter/nft_last.c
+++ b/net/netfilter/nft_last.c
@@ -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;

diff --git a/net/netfilter/nft_limit.c b/net/netfilter/nft_limit.c
index 981addb2d0515324045a6b7dbd5df09a4b75a616..145dc62c62472605e9f99c6e69f240e4c66774e9 100644 (file)
--- a/net/netfilter/nft_limit.c
+++ b/net/netfilter/nft_limit.c
@@ -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);
 

diff --git a/net/netfilter/nft_log.c b/net/netfilter/nft_log.c
index 0e13c003f0c151a78f62e41f6b177c781a24a20b..5defe6e4fd98205643e953e1b1c8ff6e04440897 100644 (file)
--- a/net/netfilter/nft_log.c
+++ b/net/netfilter/nft_log.c
@@ -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;

diff --git a/net/netfilter/nft_lookup.c b/net/netfilter/nft_lookup.c
index dfae12759c7cd982ab2c904f6f6a1deac9a080c6..cae5a67241634edacda0ddc8f90aa72932dca507 100644 (file)
--- a/net/netfilter/nft_lookup.c
+++ b/net/netfilter/nft_lookup.c
@@ -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;

diff --git a/net/netfilter/nft_masq.c b/net/netfilter/nft_masq.c
index 2a0adc497bbb4dc5aa399e1b124ca5f677c6bceb..e55e455275c48ea8875d09e45c474527464c366c 100644 (file)
--- a/net/netfilter/nft_masq.c
+++ b/net/netfilter/nft_masq.c
@@ -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);
 

diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 8c39adeebb5c3dd11572a5cec153170c4b653aab..e384e0de7a54dba81c6ad4854c3f04bb8e36206f 100644 (file)
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -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 @@ nla_put_failure:
 }
 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);
 

diff --git a/net/netfilter/nft_nat.c b/net/netfilter/nft_nat.c
index e5fd6995e4bf30fd7ef019c49d2f3a29c10cf895..0479991503900ec24b8ce7391481b46713c1de9b 100644 (file)
--- a/net/netfilter/nft_nat.c
+++ b/net/netfilter/nft_nat.c
@@ -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);
 

diff --git a/net/netfilter/nft_numgen.c b/net/netfilter/nft_numgen.c
index 45d3dc9e96f2c49c511c9f249c7104d80e16aa37..7d29db7c2ac0f05dc464e60e7be77061d5a48c63 100644 (file)
--- a/net/netfilter/nft_numgen.c
+++ b/net/netfilter/nft_numgen.c
@@ -112,7 +112,8 @@ nla_put_failure:
        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);
 

diff --git a/net/netfilter/nft_objref.c b/net/netfilter/nft_objref.c
index 74e0eea4abac4a2b0c1774f3c502693bb52185bc..7b01aa2ef65313c53a21a1621f2e53fa7f38e353 100644 (file)
--- a/net/netfilter/nft_objref.c
+++ b/net/netfilter/nft_objref.c
@@ -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);
 

diff --git a/net/netfilter/nft_osf.c b/net/netfilter/nft_osf.c
index adacf95b6e2bd204ea50c689f38be37642daaa18..70820c66b59131dde8794c9d2939de9d34686add 100644 (file)
--- a/net/netfilter/nft_osf.c
+++ b/net/netfilter/nft_osf.c
@@ -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);
 

diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c
index 53e64d8aa01f0489b2e8a8994ebb16430fe47b62..336ac668cae334f2d45a7277521375979cd9cd44 100644 (file)
--- a/net/netfilter/nft_payload.c
+++ b/net/netfilter/nft_payload.c
@@ -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);
 

diff --git a/net/netfilter/nft_queue.c b/net/netfilter/nft_queue.c
index da29e92c03e276e7a6a101fcd3b24eae1416ee37..b2b8127c8d438161d40f861aeee8a82a2e3660f6 100644 (file)
--- a/net/netfilter/nft_queue.c
+++ b/net/netfilter/nft_queue.c
@@ -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 @@ nla_put_failure:
 }
 
 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);
 

diff --git a/net/netfilter/nft_quota.c b/net/netfilter/nft_quota.c
index e6b0df68feeaf85640969c64cf8d80d84082a4ef..b1a1217bca4cd4ac58b26b406d8fbf3c8de5851e 100644 (file)
--- a/net/netfilter/nft_quota.c
+++ b/net/netfilter/nft_quota.c
@@ -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);
 

diff --git a/net/netfilter/nft_range.c b/net/netfilter/nft_range.c
index 832f0d725a9e240727e44a4b2c1d2c595b310697..0566d6aaf1e5af4b46831271f23e2c93186fa350 100644 (file)
--- a/net/netfilter/nft_range.c
+++ b/net/netfilter/nft_range.c
@@ -111,7 +111,8 @@ err1:
        return 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);
 

diff --git a/net/netfilter/nft_redir.c b/net/netfilter/nft_redir.c
index 5086adfe731cb6418c52e9c11b3f8ef3d82c1fbd..5f77399875593ba6dd88d6ea54fdae904eb6cd69 100644 (file)
--- a/net/netfilter/nft_redir.c
+++ b/net/netfilter/nft_redir.c
@@ -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);
 

diff --git a/net/netfilter/nft_reject.c b/net/netfilter/nft_reject.c
index 927ff8459bd90e922370e87a162a0eaa119d3bf3..f2addc844dd2d2f1c486e0fdbd4c3fd6b7f88e17 100644 (file)
--- a/net/netfilter/nft_reject.c
+++ b/net/netfilter/nft_reject.c
@@ -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);
 

diff --git a/net/netfilter/nft_rt.c b/net/netfilter/nft_rt.c
index 71931ec917219c125eb67d2a545041317ba2232e..5990fdd7b3cc3981f8305d88b716dd318ae18998 100644 (file)
--- a/net/netfilter/nft_rt.c
+++ b/net/netfilter/nft_rt.c
@@ -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);
 

diff --git a/net/netfilter/nft_socket.c b/net/netfilter/nft_socket.c
index 49a5348a6a14f08c7c67be724bbb5c1d9962e2c4..85f8df87efdaa22687ad5e4a7d281f901add29ba 100644 (file)
--- a/net/netfilter/nft_socket.c
+++ b/net/netfilter/nft_socket.c
@@ -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);
 

diff --git a/net/netfilter/nft_synproxy.c b/net/netfilter/nft_synproxy.c
index 6cf9a04fbfe23b52ee7064c3ed72333221c1cc46..13da882669a4ee026d286a7903e0c974e60541ac 100644 (file)
--- a/net/netfilter/nft_synproxy.c
+++ b/net/netfilter/nft_synproxy.c
@@ -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);
 

diff --git a/net/netfilter/nft_tproxy.c b/net/netfilter/nft_tproxy.c
index 62da25ad264bcfe9566b86680b8271d68864fa1c..ea83f661417e49d4f42ac59314d62fce68d7a19e 100644 (file)
--- a/net/netfilter/nft_tproxy.c
+++ b/net/netfilter/nft_tproxy.c
@@ -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);
 

diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c
index 983ade4be3b39b1cb55396a0f7ca8e2e0d0c4cac..b059aa54179860944c6da16afc92bcd2a3109bdb 100644 (file)
--- a/net/netfilter/nft_tunnel.c
+++ b/net/netfilter/nft_tunnel.c
@@ -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);
 

diff --git a/net/netfilter/nft_xfrm.c b/net/netfilter/nft_xfrm.c
index 1c5343c936a8ad0fbae9fb17fef802ca79f34c2d..c88fd078a9ae5d8166dd4deeeb75d0050754034d 100644 (file)
--- a/net/netfilter/nft_xfrm.c
+++ b/net/netfilter/nft_xfrm.c
@@ -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);