netfilter: nf_tables: garbage collection for stateful expressions

Use garbage collector to schedule removal of elements based of feedback
from expression that this element comes with. Therefore, the garbage
collector is not guided by timeout expirations in this new mode.

The new connlimit expression sets on the NFT_EXPR_GC flag to enable this
behaviour, the dynset expression needs to explicitly enable the garbage
collector via set->ops->gc_init call.

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 e3d1bac9b0d5637b506756fd9307ce4f02579db8..871cb3b012e978886cbdffb99210d0173de5c836 100644 (file)
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -342,6 +342,7 @@ struct nft_set_ops {
                                                const struct nft_set_desc *desc,
                                                const struct nlattr * const nla[]);
        void                            (*destroy)(const struct nft_set *set);
+       void                            (*gc_init)(const struct nft_set *set);
 
        unsigned int                    elemsize;
 };
@@ -712,6 +713,7 @@ struct nft_expr_type {
 };
 
 #define NFT_EXPR_STATEFUL              0x1
+#define NFT_EXPR_GC                    0x2
 
 /**
  *     struct nft_expr_ops - nf_tables expression operations
@@ -748,6 +750,8 @@ struct nft_expr_ops {
        int                             (*validate)(const struct nft_ctx *ctx,
                                                    const struct nft_expr *expr,
                                                    const struct nft_data **data);
+       bool                            (*gc)(struct net *net,
+                                             const struct nft_expr *expr);
        const struct nft_expr_type      *type;
        void                            *data;
 };

diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c
index b07a3fd9eeea3e73446c9e9533993dbc3fb30c33..4d49529cff615285bd3d1c8d5914e2624ece7da4 100644 (file)
--- a/net/netfilter/nft_dynset.c
+++ b/net/netfilter/nft_dynset.c
@@ -195,6 +195,15 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
                err = -EOPNOTSUPP;
                if (!(priv->expr->ops->type->flags & NFT_EXPR_STATEFUL))
                        goto err1;
+
+               if (priv->expr->ops->type->flags & NFT_EXPR_GC) {
+                       if (set->flags & NFT_SET_TIMEOUT)
+                               goto err1;
+                       if (!set->ops->gc_init)
+                               goto err1;
+                       set->ops->gc_init(set);
+               }
+
        } else if (set->flags & NFT_SET_EVAL)
                return -EINVAL;
 

diff --git a/net/netfilter/nft_set_hash.c b/net/netfilter/nft_set_hash.c
index dbf1f4ad077c56444d9f258d9a6c0afa38360f4e..6f9a1365a09f07c517804cec45e31cd657f93337 100644 (file)
--- a/net/netfilter/nft_set_hash.c
+++ b/net/netfilter/nft_set_hash.c
@@ -311,8 +311,16 @@ static void nft_rhash_gc(struct work_struct *work)
                        continue;
                }
 
+               if (nft_set_ext_exists(&he->ext, NFT_SET_EXT_EXPR)) {
+                       struct nft_expr *expr = nft_set_ext_expr(&he->ext);
+
+                       if (expr->ops->gc &&
+                           expr->ops->gc(read_pnet(&set->net), expr))
+                               goto gc;
+               }
                if (!nft_set_elem_expired(&he->ext))
                        continue;
+gc:
                if (nft_set_elem_mark_busy(&he->ext))
                        continue;
 
@@ -339,6 +347,14 @@ static unsigned int nft_rhash_privsize(const struct nlattr * const nla[],
        return sizeof(struct nft_rhash);
 }
 
+static void nft_rhash_gc_init(const struct nft_set *set)
+{
+       struct nft_rhash *priv = nft_set_priv(set);
+
+       queue_delayed_work(system_power_efficient_wq, &priv->gc_work,
+                          nft_set_gc_interval(set));
+}
+
 static int nft_rhash_init(const struct nft_set *set,
                          const struct nft_set_desc *desc,
                          const struct nlattr * const tb[])
@@ -356,8 +372,8 @@ static int nft_rhash_init(const struct nft_set *set,
 
        INIT_DEFERRABLE_WORK(&priv->gc_work, nft_rhash_gc);
        if (set->flags & NFT_SET_TIMEOUT)
-               queue_delayed_work(system_power_efficient_wq, &priv->gc_work,
-                                  nft_set_gc_interval(set));
+               nft_rhash_gc_init(set);
+
        return 0;
 }
 
@@ -647,6 +663,7 @@ static struct nft_set_type nft_rhash_type __read_mostly = {
                .elemsize       = offsetof(struct nft_rhash_elem, ext),
                .estimate       = nft_rhash_estimate,
                .init           = nft_rhash_init,
+               .gc_init        = nft_rhash_gc_init,
                .destroy        = nft_rhash_destroy,
                .insert         = nft_rhash_insert,
                .activate       = nft_rhash_activate,