netfilter: nf_tables: add .abort_skip_removal flag for set types

commit f175b46d9134f708358b5404730c6dfa200fbf3c upstream.

The pipapo set backend is the only user of the .abort interface so far.
To speed up pipapo abort path, removals are skipped.

The follow up patch updates the rbtree to use to build an array of
ordered elements, then use binary search. This needs a new .abort
interface but, unlike pipapo, it also need to undo/remove elements.

Add a flag and use it from the pipapo set backend.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Cc: "Kris Karas (Bug Reporting)" <bugs-a21@moonlit-rail.com>
Cc: Genes Lists <lists@sapience.com>
Cc: Philip Müller <philm@manjaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 7eac73f9b4ce34bb89c9aafcd2a565b582f5c79d..05f57ba6224476a016d3c7e51ca71b4cba1a702f 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -456,6 +456,7 @@ struct nft_set_ext;
  *     @init: initialize private data of new set instance
  *     @destroy: destroy private data of set instance
  *     @gc_init: initialize garbage collection
+ *     @abort_skip_removal: skip removal of elements from abort path
  *     @elemsize: element private size
  *
  *     Operations lookup, update and delete have simpler interfaces, are faster
@@ -513,6 +514,7 @@ struct nft_set_ops {
                                                   const struct nft_set *set);
        void                            (*gc_init)(const struct nft_set *set);
 
+       bool                            abort_skip_removal;
        unsigned int                    elemsize;
 };
 

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 8dae197c7fafb5be9bbd6070c14e69ab5efb73e9..3b9c559ab1232a8373a28eae8a0ed3aa7bdcda72 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -7702,7 +7702,8 @@ static bool nft_trans_elems_new_abort(const struct nft_ctx *ctx,
                        continue;
                }
 
-               if (!te->set->ops->abort || nft_setelem_is_catchall(te->set, te->elems[i].priv))
+               if (!te->set->ops->abort_skip_removal ||
+                   nft_setelem_is_catchall(te->set, te->elems[i].priv))
                        nft_setelem_remove(ctx->net, te->set, te->elems[i].priv);
 
                if (!nft_setelem_is_catchall(te->set, te->elems[i].priv))

diff --git a/net/netfilter/nft_set_pipapo.c b/net/netfilter/nft_set_pipapo.c
index 6d77a5f0088ad0e9c078213f14f4fa6e8f6a9b22..18e1903b1d3d0b9eb1827a7f3a353ef452427ce9 100644 (file)
--- a/net/netfilter/nft_set_pipapo.c
+++ b/net/netfilter/nft_set_pipapo.c
@@ -2370,6 +2370,7 @@ const struct nft_set_type nft_set_pipapo_type = {
                .gc_init        = nft_pipapo_gc_init,
                .commit         = nft_pipapo_commit,
                .abort          = nft_pipapo_abort,
+               .abort_skip_removal = true,
                .elemsize       = offsetof(struct nft_pipapo_elem, ext),
        },
 };
@@ -2394,6 +2395,7 @@ const struct nft_set_type nft_set_pipapo_avx2_type = {
                .gc_init        = nft_pipapo_gc_init,
                .commit         = nft_pipapo_commit,
                .abort          = nft_pipapo_abort,
+               .abort_skip_removal = true,
                .elemsize       = offsetof(struct nft_pipapo_elem, ext),
        },
 };