Skip to content

L
linux
Commit 5fc6ced9 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files
Options

netfilter: nft_set_hash: use nft_rhash prefix for resizable set backend 

This patch prepares the introduction of a non-resizable hashtable
implementation that is significantly faster.
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 080ed636
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 106 deletions
net/netfilter/nft_set_hash.c
View file @ 5fc6ced9
...@@ -22,43 +22,43 @@ ...@@ -22,43 +22,43 @@
#include <net/netfilter/nf_tables.h> #include <net/netfilter/nf_tables.h>
/* We target a hash table size of 4, element hint is 75% of final size */ /* We target a hash table size of 4, element hint is 75% of final size */
#define NFT_HASH_ELEMENT_HINT 3 #define NFT_RHASH_ELEMENT_HINT 3
struct nft_hash { struct nft_rhash {
struct rhashtable ht; struct rhashtable ht;
struct delayed_work gc_work; struct delayed_work gc_work;
}; };
struct nft_hash_elem { struct nft_rhash_elem {
struct rhash_head node; struct rhash_head node;
struct nft_set_ext ext; struct nft_set_ext ext;
}; };
struct nft_hash_cmp_arg { struct nft_rhash_cmp_arg {
const struct nft_set *set; const struct nft_set *set;
const u32 *key; const u32 *key;
u8 genmask; u8 genmask;
}; };
static inline u32 nft_hash_key(const void *data, u32 len, u32 seed) static inline u32 nft_rhash_key(const void *data, u32 len, u32 seed)
{ {
const struct nft_hash_cmp_arg *arg = data; const struct nft_rhash_cmp_arg *arg = data;
return jhash(arg->key, len, seed); return jhash(arg->key, len, seed);
} }
static inline u32 nft_hash_obj(const void *data, u32 len, u32 seed) static inline u32 nft_rhash_obj(const void *data, u32 len, u32 seed)
{ {
const struct nft_hash_elem *he = data; const struct nft_rhash_elem *he = data;
return jhash(nft_set_ext_key(&he->ext), len, seed); return jhash(nft_set_ext_key(&he->ext), len, seed);
} }
static inline int nft_hash_cmp(struct rhashtable_compare_arg *arg, static inline int nft_rhash_cmp(struct rhashtable_compare_arg *arg,
const void *ptr) const void *ptr)
{ {
const struct nft_hash_cmp_arg *x = arg->key; const struct nft_rhash_cmp_arg *x = arg->key;
const struct nft_hash_elem *he = ptr; const struct nft_rhash_elem *he = ptr;
if (memcmp(nft_set_ext_key(&he->ext), x->key, x->set->klen)) if (memcmp(nft_set_ext_key(&he->ext), x->key, x->set->klen))
return 1; return 1;
...@@ -69,33 +69,33 @@ static inline int nft_hash_cmp(struct rhashtable_compare_arg *arg, ...@@ -69,33 +69,33 @@ static inline int nft_hash_cmp(struct rhashtable_compare_arg *arg,
return 0; return 0;
} }
static const struct rhashtable_params nft_hash_params = { static const struct rhashtable_params nft_rhash_params = {
.head_offset = offsetof(struct nft_hash_elem, node), .head_offset = offsetof(struct nft_rhash_elem, node),
.hashfn = nft_hash_key, .hashfn = nft_rhash_key,
.obj_hashfn = nft_hash_obj, .obj_hashfn = nft_rhash_obj,
.obj_cmpfn = nft_hash_cmp, .obj_cmpfn = nft_rhash_cmp,
.automatic_shrinking = true, .automatic_shrinking = true,
}; };
static bool nft_hash_lookup(const struct net *net, const struct nft_set *set, static bool nft_rhash_lookup(const struct net *net, const struct nft_set *set,
const u32 *key, const struct nft_set_ext **ext) const u32 *key, const struct nft_set_ext **ext)
{ {
struct nft_hash *priv = nft_set_priv(set); struct nft_rhash *priv = nft_set_priv(set);
const struct nft_hash_elem *he; const struct nft_rhash_elem *he;
struct nft_hash_cmp_arg arg = { struct nft_rhash_cmp_arg arg = {
.genmask = nft_genmask_cur(net), .genmask = nft_genmask_cur(net),
.set = set, .set = set,
.key = key, .key = key,
}; };
he = rhashtable_lookup_fast(&priv->ht, &arg, nft_hash_params); he = rhashtable_lookup_fast(&priv->ht, &arg, nft_rhash_params);
if (he != NULL) if (he != NULL)
*ext = &he->ext; *ext = &he->ext;
return !!he; return !!he;
} }
static bool nft_hash_update(struct nft_set *set, const u32 *key, static bool nft_rhash_update(struct nft_set *set, const u32 *key,
void *(*new)(struct nft_set *, void *(*new)(struct nft_set *,
const struct nft_expr *, const struct nft_expr *,
struct nft_regs *regs), struct nft_regs *regs),
...@@ -103,15 +103,15 @@ static bool nft_hash_update(struct nft_set *set, const u32 *key, ...@@ -103,15 +103,15 @@ static bool nft_hash_update(struct nft_set *set, const u32 *key,
struct nft_regs *regs, struct nft_regs *regs,
const struct nft_set_ext **ext) const struct nft_set_ext **ext)
{ {
struct nft_hash *priv = nft_set_priv(set); struct nft_rhash *priv = nft_set_priv(set);
struct nft_hash_elem *he, *prev; struct nft_rhash_elem *he, *prev;
struct nft_hash_cmp_arg arg = { struct nft_rhash_cmp_arg arg = {
.genmask = NFT_GENMASK_ANY, .genmask = NFT_GENMASK_ANY,
.set = set, .set = set,
.key = key, .key = key,
}; };
he = rhashtable_lookup_fast(&priv->ht, &arg, nft_hash_params); he = rhashtable_lookup_fast(&priv->ht, &arg, nft_rhash_params);
if (he != NULL) if (he != NULL)
goto out; goto out;
...@@ -120,7 +120,7 @@ static bool nft_hash_update(struct nft_set *set, const u32 *key, ...@@ -120,7 +120,7 @@ static bool nft_hash_update(struct nft_set *set, const u32 *key,
goto err1; goto err1;
prev = rhashtable_lookup_get_insert_key(&priv->ht, &arg, &he->node, prev = rhashtable_lookup_get_insert_key(&priv->ht, &arg, &he->node,
nft_hash_params); nft_rhash_params);
if (IS_ERR(prev)) if (IS_ERR(prev))
goto err2; goto err2;
...@@ -140,21 +140,21 @@ static bool nft_hash_update(struct nft_set *set, const u32 *key, ...@@ -140,21 +140,21 @@ static bool nft_hash_update(struct nft_set *set, const u32 *key,
return false; return false;
} }
static int nft_hash_insert(const struct net *net, const struct nft_set *set, static int nft_rhash_insert(const struct net *net, const struct nft_set *set,
const struct nft_set_elem *elem, const struct nft_set_elem *elem,
struct nft_set_ext **ext) struct nft_set_ext **ext)
{ {
struct nft_hash *priv = nft_set_priv(set); struct nft_rhash *priv = nft_set_priv(set);
struct nft_hash_elem *he = elem->priv; struct nft_rhash_elem *he = elem->priv;
struct nft_hash_cmp_arg arg = { struct nft_rhash_cmp_arg arg = {
.genmask = nft_genmask_next(net), .genmask = nft_genmask_next(net),
.set = set, .set = set,
.key = elem->key.val.data, .key = elem->key.val.data,
}; };
struct nft_hash_elem *prev; struct nft_rhash_elem *prev;
prev = rhashtable_lookup_get_insert_key(&priv->ht, &arg, &he->node, prev = rhashtable_lookup_get_insert_key(&priv->ht, &arg, &he->node,
nft_hash_params); nft_rhash_params);
if (IS_ERR(prev)) if (IS_ERR(prev))
return PTR_ERR(prev); return PTR_ERR(prev);
if (prev) { if (prev) {
...@@ -164,19 +164,19 @@ static int nft_hash_insert(const struct net *net, const struct nft_set *set, ...@@ -164,19 +164,19 @@ static int nft_hash_insert(const struct net *net, const struct nft_set *set,
return 0; return 0;
} }
static void nft_hash_activate(const struct net *net, const struct nft_set *set, static void nft_rhash_activate(const struct net *net, const struct nft_set *set,
const struct nft_set_elem *elem) const struct nft_set_elem *elem)
{ {
struct nft_hash_elem *he = elem->priv; struct nft_rhash_elem *he = elem->priv;
nft_set_elem_change_active(net, set, &he->ext); nft_set_elem_change_active(net, set, &he->ext);
nft_set_elem_clear_busy(&he->ext); nft_set_elem_clear_busy(&he->ext);
} }
static bool nft_hash_flush(const struct net *net, static bool nft_rhash_flush(const struct net *net,
const struct nft_set *set, void *priv) const struct nft_set *set, void *priv)
{ {
struct nft_hash_elem *he = priv; struct nft_rhash_elem *he = priv;
if (!nft_set_elem_mark_busy(&he->ext) || if (!nft_set_elem_mark_busy(&he->ext) ||
!nft_is_active(net, &he->ext)) { !nft_is_active(net, &he->ext)) {
...@@ -186,22 +186,22 @@ static bool nft_hash_flush(const struct net *net, ...@@ -186,22 +186,22 @@ static bool nft_hash_flush(const struct net *net,
return false; return false;
} }
static void *nft_hash_deactivate(const struct net *net, static void *nft_rhash_deactivate(const struct net *net,
const struct nft_set *set, const struct nft_set *set,
const struct nft_set_elem *elem) const struct nft_set_elem *elem)
{ {
struct nft_hash *priv = nft_set_priv(set); struct nft_rhash *priv = nft_set_priv(set);
struct nft_hash_elem *he; struct nft_rhash_elem *he;
struct nft_hash_cmp_arg arg = { struct nft_rhash_cmp_arg arg = {
.genmask = nft_genmask_next(net), .genmask = nft_genmask_next(net),
.set = set, .set = set,
.key = elem->key.val.data, .key = elem->key.val.data,
}; };
rcu_read_lock(); rcu_read_lock();
he = rhashtable_lookup_fast(&priv->ht, &arg, nft_hash_params); he = rhashtable_lookup_fast(&priv->ht, &arg, nft_rhash_params);
if (he != NULL && if (he != NULL &&
!nft_hash_flush(net, set, he)) !nft_rhash_flush(net, set, he))
he = NULL; he = NULL;
rcu_read_unlock(); rcu_read_unlock();
...@@ -209,21 +209,21 @@ static void *nft_hash_deactivate(const struct net *net, ...@@ -209,21 +209,21 @@ static void *nft_hash_deactivate(const struct net *net,
return he; return he;
} }
static void nft_hash_remove(const struct net *net, static void nft_rhash_remove(const struct net *net,
const struct nft_set *set, const struct nft_set *set,
const struct nft_set_elem *elem) const struct nft_set_elem *elem)
{ {
struct nft_hash *priv = nft_set_priv(set); struct nft_rhash *priv = nft_set_priv(set);
struct nft_hash_elem *he = elem->priv; struct nft_rhash_elem *he = elem->priv;
rhashtable_remove_fast(&priv->ht, &he->node, nft_hash_params); rhashtable_remove_fast(&priv->ht, &he->node, nft_rhash_params);
} }
static void nft_hash_walk(const struct nft_ctx *ctx, struct nft_set *set, static void nft_rhash_walk(const struct nft_ctx *ctx, struct nft_set *set,
struct nft_set_iter *iter) struct nft_set_iter *iter)
{ {
struct nft_hash *priv = nft_set_priv(set); struct nft_rhash *priv = nft_set_priv(set);
struct nft_hash_elem *he; struct nft_rhash_elem *he;
struct rhashtable_iter hti; struct rhashtable_iter hti;
struct nft_set_elem elem; struct nft_set_elem elem;
int err; int err;
...@@ -272,16 +272,16 @@ static void nft_hash_walk(const struct nft_ctx *ctx, struct nft_set *set, ...@@ -272,16 +272,16 @@ static void nft_hash_walk(const struct nft_ctx *ctx, struct nft_set *set,
rhashtable_walk_exit(&hti); rhashtable_walk_exit(&hti);
} }
static void nft_hash_gc(struct work_struct *work) static void nft_rhash_gc(struct work_struct *work)
{ {
struct nft_set *set; struct nft_set *set;
struct nft_hash_elem *he; struct nft_rhash_elem *he;
struct nft_hash *priv; struct nft_rhash *priv;
struct nft_set_gc_batch *gcb = NULL; struct nft_set_gc_batch *gcb = NULL;
struct rhashtable_iter hti; struct rhashtable_iter hti;
int err; int err;
priv = container_of(work, struct nft_hash, gc_work.work); priv = container_of(work, struct nft_rhash, gc_work.work);
set = nft_set_container_of(priv); set = nft_set_container_of(priv);
err = rhashtable_walk_init(&priv->ht, &hti, GFP_KERNEL); err = rhashtable_walk_init(&priv->ht, &hti, GFP_KERNEL);
...@@ -307,7 +307,7 @@ static void nft_hash_gc(struct work_struct *work) ...@@ -307,7 +307,7 @@ static void nft_hash_gc(struct work_struct *work)
gcb = nft_set_gc_batch_check(set, gcb, GFP_ATOMIC); gcb = nft_set_gc_batch_check(set, gcb, GFP_ATOMIC);
if (gcb == NULL) if (gcb == NULL)
goto out; goto out;
rhashtable_remove_fast(&priv->ht, &he->node, nft_hash_params); rhashtable_remove_fast(&priv->ht, &he->node, nft_rhash_params);
atomic_dec(&set->nelems); atomic_dec(&set->nelems);
nft_set_gc_batch_add(gcb, he); nft_set_gc_batch_add(gcb, he);
} }
...@@ -321,55 +321,55 @@ static void nft_hash_gc(struct work_struct *work) ...@@ -321,55 +321,55 @@ static void nft_hash_gc(struct work_struct *work)
nft_set_gc_interval(set)); nft_set_gc_interval(set));
} }
static unsigned int nft_hash_privsize(const struct nlattr * const nla[]) static unsigned int nft_rhash_privsize(const struct nlattr * const nla[])
{ {
return sizeof(struct nft_hash); return sizeof(struct nft_rhash);
} }
static int nft_hash_init(const struct nft_set *set, static int nft_rhash_init(const struct nft_set *set,
const struct nft_set_desc *desc, const struct nft_set_desc *desc,
const struct nlattr * const tb[]) const struct nlattr * const tb[])
{ {
struct nft_hash *priv = nft_set_priv(set); struct nft_rhash *priv = nft_set_priv(set);
struct rhashtable_params params = nft_hash_params; struct rhashtable_params params = nft_rhash_params;
int err; int err;
params.nelem_hint = desc->size ?: NFT_HASH_ELEMENT_HINT; params.nelem_hint = desc->size ?: NFT_RHASH_ELEMENT_HINT;
params.key_len = set->klen; params.key_len = set->klen;
err = rhashtable_init(&priv->ht, &params); err = rhashtable_init(&priv->ht, &params);
if (err < 0) if (err < 0)
return err; return err;
INIT_DEFERRABLE_WORK(&priv->gc_work, nft_hash_gc); INIT_DEFERRABLE_WORK(&priv->gc_work, nft_rhash_gc);
if (set->flags & NFT_SET_TIMEOUT) if (set->flags & NFT_SET_TIMEOUT)
queue_delayed_work(system_power_efficient_wq, &priv->gc_work, queue_delayed_work(system_power_efficient_wq, &priv->gc_work,
nft_set_gc_interval(set)); nft_set_gc_interval(set));
return 0; return 0;
} }
static void nft_hash_elem_destroy(void *ptr, void *arg) static void nft_rhash_elem_destroy(void *ptr, void *arg)
{ {
nft_set_elem_destroy(arg, ptr, true); nft_set_elem_destroy(arg, ptr, true);
} }
static void nft_hash_destroy(const struct nft_set *set) static void nft_rhash_destroy(const struct nft_set *set)
{ {
struct nft_hash *priv = nft_set_priv(set); struct nft_rhash *priv = nft_set_priv(set);
cancel_delayed_work_sync(&priv->gc_work); cancel_delayed_work_sync(&priv->gc_work);
rhashtable_free_and_destroy(&priv->ht, nft_hash_elem_destroy, rhashtable_free_and_destroy(&priv->ht, nft_rhash_elem_destroy,
(void *)set); (void *)set);
} }
static bool nft_hash_estimate(const struct nft_set_desc *desc, u32 features, static bool nft_rhash_estimate(const struct nft_set_desc *desc, u32 features,
struct nft_set_estimate *est) struct nft_set_estimate *est)
{ {
if (desc->size) if (desc->size)
est->size = sizeof(struct nft_hash) + est->size = sizeof(struct nft_rhash) +
roundup_pow_of_two(desc->size * 4 / 3) * roundup_pow_of_two(desc->size * 4 / 3) *
sizeof(struct nft_hash_elem *) + sizeof(struct nft_rhash_elem *) +
desc->size * sizeof(struct nft_hash_elem); desc->size * sizeof(struct nft_rhash_elem);
else else
est->size = ~0; est->size = ~0;
...@@ -379,32 +379,32 @@ static bool nft_hash_estimate(const struct nft_set_desc *desc, u32 features, ...@@ -379,32 +379,32 @@ static bool nft_hash_estimate(const struct nft_set_desc *desc, u32 features,
return true; return true;
} }
static struct nft_set_ops nft_hash_ops __read_mostly = { static struct nft_set_ops nft_rhash_ops __read_mostly = {
.privsize = nft_hash_privsize, .privsize = nft_rhash_privsize,
.elemsize = offsetof(struct nft_hash_elem, ext), .elemsize = offsetof(struct nft_rhash_elem, ext),
.estimate = nft_hash_estimate, .estimate = nft_rhash_estimate,
.init = nft_hash_init, .init = nft_rhash_init,
.destroy = nft_hash_destroy, .destroy = nft_rhash_destroy,
.insert = nft_hash_insert, .insert = nft_rhash_insert,
.activate = nft_hash_activate, .activate = nft_rhash_activate,
.deactivate = nft_hash_deactivate, .deactivate = nft_rhash_deactivate,
.flush = nft_hash_flush, .flush = nft_rhash_flush,
.remove = nft_hash_remove, .remove = nft_rhash_remove,
.lookup = nft_hash_lookup, .lookup = nft_rhash_lookup,
.update = nft_hash_update, .update = nft_rhash_update,
.walk = nft_hash_walk, .walk = nft_rhash_walk,
.features = NFT_SET_MAP | NFT_SET_OBJECT | NFT_SET_TIMEOUT, .features = NFT_SET_MAP | NFT_SET_OBJECT | NFT_SET_TIMEOUT,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init nft_hash_module_init(void) static int __init nft_hash_module_init(void)
{ {
return nft_register_set(&nft_hash_ops); return nft_register_set(&nft_rhash_ops);
} }
static void __exit nft_hash_module_exit(void) static void __exit nft_hash_module_exit(void)
{ {
nft_unregister_set(&nft_hash_ops); nft_unregister_set(&nft_rhash_ops);
} }
module_init(nft_hash_module_init); module_init(nft_hash_module_init);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7