netfilter: nft_set updates
Subsystems (2)
Florian Westphal
maintainerv2 cover netfilter: nft_set updates
v2: minor kdoc updates. I copied Stefanos RvB tags.
This series serves as preparation to make pipapos avx2 functions available from the control plane.
First patch removes a few unused arguments.
Second and third patch simplify some of the set api functions.
The fourth patch is the main change, it removes the control-plane only C implementation of the pipapo lookup algorithm.
The last patch allows the scratch maps to be backed by vmalloc.
Florian Westphal (5):
netfilter: nft_set_pipapo: remove unused arguments
netfilter: nft_set: remove one argument from lookup and update
functions
netfilter: nft_set: remove indirection from update API call
netfilter: nft_set_pipapo: merge pipapo_get/lookup
netfilter: nft_set_pipapo: prefer kvmalloc for scratch maps
include/net/netfilter/nf_tables.h | 14 +- include/net/netfilter/nf_tables_core.h | 50 +++--- net/netfilter/nft_dynset.c | 10 +- net/netfilter/nft_lookup.c | 27 ++-- net/netfilter/nft_objref.c | 5 +- net/netfilter/nft_set_bitmap.c | 11 +- net/netfilter/nft_set_hash.c | 54 +++---- net/netfilter/nft_set_pipapo.c | 204 ++++++++----------------- net/netfilter/nft_set_pipapo_avx2.c | 26 ++-- net/netfilter/nft_set_rbtree.c | 40 +++-- 10 files changed, 184 insertions(+), 257 deletions(-)
Signature · 1 line
2.49.0
Florian Westphal
maintainerPATCH v2 1/5 netfilter: nft_set_pipapo: remove unused arguments
They are not used anymore, so remove them.
---
no changes.
net/netfilter/nft_set_pipapo.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
net/netfilter/nft_set_pipapo.c +5 -9
@@ -502,8 +502,6 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,/** * pipapo_get() - Get matching element reference given key data -* @net: Network namespace -* @set: nftables API set representation * @m: storage containing active/existing elements * @data: Key data to be matched against existing elements * @genmask: If set, check that element is active in given genmask
@@ -516,9 +514,7 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set,* * Return: pointer to &struct nft_pipapo_elem on match, error pointer otherwise. */ -static struct nft_pipapo_elem *pipapo_get (const struct net *net, -const struct nft_set *set, -const struct nft_pipapo_match *m, +static struct nft_pipapo_elem *pipapo_get (const struct nft_pipapo_match *m,const u8 *data,u8 genmask,u64 tstamp,gfp_t gfp) {
@@ -615,7 +611,7 @@ nft_pipapo_get(const struct net *net, const struct nft_set *set,struct nft_pipapo_match *m =rcu_dereference (priv->match);struct nft_pipapo_elem *e; - e =pipapo_get (net, set, m, (const u8 *)elem->key.val.data, + e =pipapo_get (m, (const u8 *)elem->key.val.data,nft_genmask_cur (net),get_jiffies_64 (),GFP_ATOMIC );if (IS_ERR (e))
@@ -1345,7 +1341,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,else end = start; - dup =pipapo_get (net, set, m, start, genmask, tstamp,GFP_KERNEL ); + dup =pipapo_get (m, start, genmask, tstamp,GFP_KERNEL );if (!IS_ERR (dup)) {/* Check if we already have the same exact entry */ const struct nft_data *dup_key, *dup_end;
@@ -1367,7 +1363,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,if (PTR_ERR (dup) == -ENOENT ) {/* Look for partially overlapping entries */ - dup =pipapo_get (net, set, m, end,nft_genmask_next (net), tstamp, + dup =pipapo_get (m, end,nft_genmask_next (net), tstamp,GFP_KERNEL ); }
@@ -1914,7 +1910,7 @@ nft_pipapo_deactivate(const struct net *net, const struct nft_set *set,if (!m)return NULL ; - e =pipapo_get (net, set, m, (const u8 *)elem->key.val.data, + e =pipapo_get (m, (const u8 *)elem->key.val.data,nft_genmask_next (net),nft_net_tstamp (net),GFP_KERNEL );if (IS_ERR (e))return NULL ;
Signature · 1 line
2.49.0
Florian Westphal
maintainerPATCH v2 2/5 netfilter: nft_set: remove one argument from lookup and update functions
In reply to Florian WestphalReturn the extension pointer instead of passing it as a function argument to be filled in by the callee.
As-is, whenever false is returned, the extension pointer is not used.
For all set types, when true is returned, the extension pointer was set to the matching element.
Only exception: nft_set_bitmap doesn't support extensions. Return a pointer to a static const empty element extension container.
return false -> return NULL
return true -> return the elements' extension pointer.
This saves one function argument.
---
v2: zap one excess kdoc comment (build robot)
include/net/netfilter/nf_tables.h | 10 ++--- include/net/netfilter/nf_tables_core.h | 47 ++++++++++++---------- net/netfilter/nft_dynset.c | 5 ++- net/netfilter/nft_lookup.c | 27 ++++++------- net/netfilter/nft_objref.c | 5 +-- net/netfilter/nft_set_bitmap.c | 11 ++++-- net/netfilter/nft_set_hash.c | 54 ++++++++++++-------------- net/netfilter/nft_set_pipapo.c | 19 +++++---- net/netfilter/nft_set_pipapo_avx2.c | 25 ++++++------ net/netfilter/nft_set_rbtree.c | 40 +++++++++---------- 10 files changed, 126 insertions(+), 117 deletions(-)
include/net/netfilter/nf_tables.h +4 -6
@@ -459,19 +459,17 @@ struct nft_set_ext;* control plane functions. */ struct nft_set_ops { -bool (*lookup)(const struct net *net, +const struct nft_set_ext * (*lookup)(const struct net *net,const struct nft_set *set, -const u32 *key, -const struct nft_set_ext **ext); -bool (*update)(struct nft_set *set, +const u32 *key); +const struct nft_set_ext * (*update)(struct nft_set *set,const u32 *key,struct nft_elem_priv * (*new)(struct nft_set *,const struct nft_expr *,struct nft_regs *),const struct nft_expr *expr, -struct nft_regs *regs, -const struct nft_set_ext **ext); +struct nft_regs *regs);bool (*delete)(const struct nft_set *set,const u32 *key);
include/net/netfilter/nf_tables_core.h +27 -20
61 lines not on this page · raw message
net/netfilter/nft_dynset.c +3 -2
@@ -91,8 +91,9 @@ void nft_dynset_eval(const struct nft_expr *expr,return ; } -if (set->ops->update (set, ®s->data[priv->sreg_key], nft_dynset_new, - expr, regs, &ext)) { + ext = set->ops->update (set, ®s->data[priv->sreg_key], nft_dynset_new, + expr, regs); +if (ext) {if (priv->op ==NFT_DYNSET_OP_UPDATE &&nft_set_ext_exists (ext,NFT_SET_EXT_TIMEOUT ) &&READ_ONCE (nft_set_ext_timeout (ext)->timeout) !=0 ) {
net/netfilter/nft_lookup.c +14 -13
@@ -25,32 +25,33 @@ struct nft_lookup { };#ifdef CONFIG_MITIGATION_RETPOLINE -bool nft_set_do_lookup (const struct net *net,const struct nft_set *set, -const u32 *key,const struct nft_set_ext **ext) +const struct nft_set_ext * +nft_set_do_lookup (const struct net *net,const struct nft_set *set, +const u32 *key) {if (set->ops == &nft_set_hash_fast_type.ops) -return nft_hash_lookup_fast (net, set, key, ext); +return nft_hash_lookup_fast (net, set, key);if (set->ops == &nft_set_hash_type.ops) -return nft_hash_lookup (net, set, key, ext); +return nft_hash_lookup (net, set, key);if (set->ops == &nft_set_rhash_type.ops) -return nft_rhash_lookup (net, set, key, ext); +return nft_rhash_lookup (net, set, key);if (set->ops == &nft_set_bitmap_type.ops) -return nft_bitmap_lookup (net, set, key, ext); +return nft_bitmap_lookup (net, set, key);if (set->ops == &nft_set_pipapo_type.ops) -return nft_pipapo_lookup (net, set, key, ext); +return nft_pipapo_lookup (net, set, key);#if defined(CONFIG_X86_64 ) && !defined(CONFIG_UML )if (set->ops == &nft_set_pipapo_avx2_type.ops) -return nft_pipapo_avx2_lookup (net, set, key, ext); +return nft_pipapo_avx2_lookup (net, set, key);#endif if (set->ops == &nft_set_rbtree_type.ops) -return nft_rbtree_lookup (net, set, key, ext); +return nft_rbtree_lookup (net, set, key);WARN_ON_ONCE (1 ); -return set->ops->lookup (net, set, key, ext); +return set->ops->lookup (net, set, key); }EXPORT_SYMBOL_GPL (nft_set_do_lookup);#endif
@@ -61,12 +62,12 @@ void nft_lookup_eval(const struct nft_expr *expr, {const struct nft_lookup *priv =nft_expr_priv (expr);const struct nft_set *set = priv->set; -const struct nft_set_ext *ext =NULL ;const struct net *net =nft_net (pkt); +const struct nft_set_ext *ext;bool found; - found =nft_set_do_lookup (net, set, ®s->data[priv->sreg], &ext) ^ - priv->invert; + ext =nft_set_do_lookup (net, set, ®s->data[priv->sreg]); + found = !!ext ^ priv->invert;if (!found) { ext =nft_set_catchall_lookup (net, set);if (!ext) {
net/netfilter/nft_objref.c +2 -3
@@ -111,10 +111,9 @@ void nft_objref_map_eval(const struct nft_expr *expr,struct net *net =nft_net (pkt);const struct nft_set_ext *ext;struct nft_object *obj; -bool found; - found =nft_set_do_lookup (net, set, ®s->data[priv->sreg], &ext); -if (!found) { + ext =nft_set_do_lookup (net, set, ®s->data[priv->sreg]); +if (!ext) { ext =nft_set_catchall_lookup (net, set);if (!ext) { regs->verdict.code =NFT_BREAK ;
net/netfilter/nft_set_bitmap.c +8 -3
@@ -75,16 +75,21 @@ nft_bitmap_active(const u8 *bitmap, u32 idx, u32 off, u8 genmask) }INDIRECT_CALLABLE_SCOPE -bool nft_bitmap_lookup(const struct net *net, const struct nft_set *set, -const u32 *key,const struct nft_set_ext **ext) +const struct nft_set_ext * +nft_bitmap_lookup (const struct net *net,const struct nft_set *set, +const u32 *key) {const struct nft_bitmap *priv =nft_set_priv (set); +static const struct nft_set_ext found;u8 genmask =nft_genmask_cur (net);u32 idx, off;nft_bitmap_location (set, key, &idx, &off); -return nft_bitmap_active (priv->bitmap, idx, off, genmask); +if (nft_bitmap_active (priv->bitmap, idx, off, genmask)) +return &found; + +return NULL ; } static struct nft_bitmap_elem *
net/netfilter/nft_set_hash.c +24 -30
110 lines not on this page · raw message
net/netfilter/nft_set_pipapo.c +11 -8
@@ -407,8 +407,9 @@ int pipapo_refill(unsigned long *map, unsigned int len, unsigned int rules,* * Return: true on match, false otherwise. */ -bool nft_pipapo_lookup (const struct net *net,const struct nft_set *set, -const u32 *key,const struct nft_set_ext **ext) +const struct nft_set_ext * +nft_pipapo_lookup (const struct net *net,const struct nft_set *set, +const u32 *key) {struct nft_pipapo *priv =nft_set_priv (set);struct nft_pipapo_scratch *scratch;
@@ -465,13 +466,15 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, scratch->map_index = map_index;local_bh_enable (); -return false; +return NULL ; }if (last) { - *ext = &f->mt[b].e->ext; -if (unlikely (nft_set_elem_expired (*ext) || - !nft_set_elem_active (*ext, genmask))) +const struct nft_set_ext *ext; + + ext = &f->mt[b].e->ext; +if (unlikely (nft_set_elem_expired (ext) || + !nft_set_elem_active (ext, genmask))) goto next_match;/* Last field: we're just returning the key without
@@ -482,7 +485,7 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, scratch->map_index = map_index;local_bh_enable (); -return true; +return ext; }/* Swap bitmap indices: res_map is the initial bitmap for the
@@ -497,7 +500,7 @@ bool nft_pipapo_lookup(const struct net *net, const struct nft_set *set, out:local_bh_enable (); -return false; +return NULL ; }/**
net/netfilter/nft_set_pipapo_avx2.c +14 -11
@@ -1146,8 +1146,9 @@ static inline void pipapo_resmap_init_avx2(const struct nft_pipapo_match *m, uns* * Return: true on match, false otherwise. */ -bool nft_pipapo_avx2_lookup (const struct net *net,const struct nft_set *set, -const u32 *key,const struct nft_set_ext **ext) +const struct nft_set_ext * +nft_pipapo_avx2_lookup (const struct net *net,const struct nft_set *set, +const u32 *key) {struct nft_pipapo *priv =nft_set_priv (set);struct nft_pipapo_scratch *scratch;
@@ -1155,17 +1156,18 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set,const struct nft_pipapo_match *m;const struct nft_pipapo_field *f;const u8 *rp = (const u8 *)key; +const struct nft_set_ext *ext;unsigned long *res, *fill;bool map_index; -int i, ret =0 ; +int i;local_bh_disable ();if (unlikely (!irq_fpu_usable ())) { -bool fallback_res =nft_pipapo_lookup (net, set, key, ext); + ext =nft_pipapo_lookup (net, set, key);local_bh_enable (); -return fallback_res; +return ext; } m =rcu_dereference (priv->match);
@@ -1182,7 +1184,7 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set,if (unlikely (!scratch)) {kernel_fpu_end ();local_bh_enable (); -return false; +return NULL ; } map_index = scratch->map_index;
@@ -1197,6 +1199,7 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set, next_match:nft_pipapo_for_each_field (f, i, m) {bool last = i == m->field_count -1 , first = !i; +int ret =0 ;#define NFT_SET_PIPAPO_AVX2_LOOKUP (b, n) \ (ret = nft_pipapo_avx2_lookup_##b##b_##n(res, fill, f, \
@@ -1244,10 +1247,10 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set, goto out;if (last) { - *ext = &f->mt[ret].e->ext; -if (unlikely (nft_set_elem_expired (*ext) || - !nft_set_elem_active (*ext, genmask))) { - ret =0 ; + ext = &f->mt[ret].e->ext; +if (unlikely (nft_set_elem_expired (ext) || + !nft_set_elem_active (ext, genmask))) { + ext =NULL ; goto next_match; }
@@ -1264,5 +1267,5 @@ bool nft_pipapo_avx2_lookup(const struct net *net, const struct nft_set *set,kernel_fpu_end ();local_bh_enable (); -return ret >=0 ; +return ext; }
net/netfilter/nft_set_rbtree.c +19 -21
@@ -52,9 +52,9 @@ static bool nft_rbtree_elem_expired(const struct nft_rbtree_elem *rbe)return nft_set_elem_expired (&rbe->ext); } -static bool __nft_rbtree_lookup (const struct net *net,const struct nft_set *set, -const u32 *key,const struct nft_set_ext **ext, -unsigned int seq) +static const struct nft_set_ext * +__nft_rbtree_lookup (const struct net *net,const struct nft_set *set, +const u32 *key,unsigned int seq) {struct nft_rbtree *priv =nft_set_priv (set);const struct nft_rbtree_elem *rbe, *interval =NULL ;
@@ -65,7 +65,7 @@ static bool __nft_rbtree_lookup(const struct net *net, const struct nft_set *set parent =rcu_dereference_raw (priv->root.rb_node);while (parent !=NULL ) {if (read_seqcount_retry (&priv->count, seq)) -return false; +return NULL ; rbe = rb_entry(parent, struct nft_rbtree_elem, node);
@@ -87,50 +87,48 @@ static bool __nft_rbtree_lookup(const struct net *net, const struct nft_set *set }if (nft_rbtree_elem_expired (rbe)) -return false; +return NULL ;if (nft_rbtree_interval_end (rbe)) {if (nft_set_is_anonymous (set)) -return false; +return NULL ; parent =rcu_dereference_raw (parent->rb_left); interval =NULL ;continue ; } - *ext = &rbe->ext; -return true; +return &rbe->ext; } }if (set->flags &NFT_SET_INTERVAL && interval !=NULL &&nft_set_elem_active (&interval->ext, genmask) && !nft_rbtree_elem_expired (interval) && -nft_rbtree_interval_start (interval)) { - *ext = &interval->ext; -return true; - } +nft_rbtree_interval_start (interval)) +return &interval->ext; -return false; +return NULL ; }INDIRECT_CALLABLE_SCOPE -bool nft_rbtree_lookup(const struct net *net, const struct nft_set *set, -const u32 *key,const struct nft_set_ext **ext) +const struct nft_set_ext * +nft_rbtree_lookup (const struct net *net,const struct nft_set *set, +const u32 *key) {struct nft_rbtree *priv =nft_set_priv (set);unsigned int seq =read_seqcount_begin (&priv->count); -bool ret; +const struct nft_set_ext *ext; - ret =__nft_rbtree_lookup (net, set, key, ext, seq); -if (ret || !read_seqcount_retry (&priv->count, seq)) -return ret; + ext =__nft_rbtree_lookup (net, set, key, seq); +if (ext || !read_seqcount_retry (&priv->count, seq)) +return ext;read_lock_bh (&priv->lock); seq =read_seqcount_begin (&priv->count); - ret =__nft_rbtree_lookup (net, set, key, ext, seq); + ext =__nft_rbtree_lookup (net, set, key, seq);read_unlock_bh (&priv->lock); -return ret; +return ext; } static bool __nft_rbtree_get(const struct net *net, const struct nft_set *set,
Signature · 1 line
2.49.0
Florian Westphal
maintainerPATCH v2 3/5 netfilter: nft_set: remove indirection from update API call
In reply to Florian WestphalThis stems from a time when sets and nft_dynset resided in different kernel modules. We can replace this with a direct call.
We could even remove both ->update and ->delete, given its only supported by rhashtable, but on the off-chance we'll see runtime add/delete for other types or a new set type keep that as-is for now.
---
v2: no changes.
include/net/netfilter/nf_tables.h | 4 ---- include/net/netfilter/nf_tables_core.h | 3 +++ net/netfilter/nft_dynset.c | 9 ++++----- net/netfilter/nft_set_hash.c | 4 +--- net/netfilter/nft_set_pipapo_avx2.c | 1 - 5 files changed, 8 insertions(+), 13 deletions(-)
include/net/netfilter/nf_tables.h +0 -4
@@ -464,10 +464,6 @@ struct nft_set_ops { const u32 *key);const struct nft_set_ext * (*update)(struct nft_set *set,const u32 *key, -struct nft_elem_priv * - (*new)(struct nft_set *, -const struct nft_expr *, -struct nft_regs *),const struct nft_expr *expr,struct nft_regs *regs); bool (*delete)(const struct nft_set *set,
include/net/netfilter/nf_tables_core.h +3 -0
@@ -188,4 +188,7 @@ void nft_objref_eval(const struct nft_expr *expr, struct nft_regs *regs, const struct nft_pktinfo *pkt);void nft_objref_map_eval (const struct nft_expr *expr,struct nft_regs *regs,const struct nft_pktinfo *pkt); +struct nft_elem_priv *nft_dynset_new (struct nft_set *set, +const struct nft_expr *expr, +struct nft_regs *regs);#endif /* _NET_NF_TABLES_CORE_H */
net/netfilter/nft_dynset.c +4 -5
@@ -44,9 +44,9 @@ static int nft_dynset_expr_setup(const struct nft_dynset *priv,return 0 ; } -static struct nft_elem_priv *nft_dynset_new (struct nft_set *set, -const struct nft_expr *expr, -struct nft_regs *regs) +struct nft_elem_priv *nft_dynset_new (struct nft_set *set, +const struct nft_expr *expr, +struct nft_regs *regs) {const struct nft_dynset *priv =nft_expr_priv (expr);struct nft_set_ext *ext;
@@ -91,8 +91,7 @@ void nft_dynset_eval(const struct nft_expr *expr,return ; } - ext = set->ops->update (set, ®s->data[priv->sreg_key], nft_dynset_new, - expr, regs); + ext = set->ops->update (set, ®s->data[priv->sreg_key], expr, regs);if (ext) { if (priv->op == NFT_DYNSET_OP_UPDATE && nft_set_ext_exists(ext, NFT_SET_EXT_TIMEOUT) &&
net/netfilter/nft_set_hash.c +1 -3
@@ -123,8 +123,6 @@ nft_rhash_get(const struct net *net, const struct nft_set *set,static const struct nft_set_ext *nft_rhash_update (struct nft_set *set,const u32 *key, -struct nft_elem_priv *(*new)(struct nft_set *,const struct nft_expr *, -struct nft_regs *regs),const struct nft_expr *expr,struct nft_regs *regs) {struct nft_rhash *priv =nft_set_priv (set);
@@ -141,7 +139,7 @@ nft_rhash_update(struct nft_set *set, const u32 *key,if (he !=NULL ) goto out; - elem_priv =new (set, expr, regs); + elem_priv =nft_dynset_new (set, expr, regs);if (!elem_priv) goto err1;
net/netfilter/nft_set_pipapo_avx2.c +0 -1
@@ -1137,7 +1137,6 @@ static inline void pipapo_resmap_init_avx2(const struct nft_pipapo_match *m, uns* @net: Network namespace * @set: nftables API set representation * @key: nftables API element representation containing key data -* @ext: nftables API extension pointer, filled with matching reference * * For more details, see DOC: Theory of Operation in nft_set_pipapo.c. *
Signature · 1 line
2.49.0
Florian Westphal
maintainerPATCH v2 4/5 netfilter: nft_set_pipapo: merge pipapo_get/lookup
In reply to Florian WestphalThe matching algorithm has implemented thrice:
1. data path lookup, generic version
2. data path lookup, avx2 version
3. control plane lookup
Merge 1 and 3 by refactoring pipapo_get as a common helper, then make nft_pipapo_lookup and nft_pipapo_get both call the common helper.
Aside from the code savings this has the benefit that we no longer allocate temporary scratch maps for each control plane get and insertion operation.
---
v2: Fix comments/slight rewording
remove one TODO, I've a pending patch to fix this up so its not too useful.
net/netfilter/nft_set_pipapo.c | 188 ++++++++++----------------------- 1 file changed, 58 insertions(+), 130 deletions(-)
net/netfilter/nft_set_pipapo.c +58 -130
@@ -397,35 +397,36 @@ int pipapo_refill(unsigned long *map, unsigned int len, unsigned int rules, }/** -* nft_pipapo_lookup() - Lookup function -* @net: Network namespace -* @set: nftables API set representation -* @key: nftables API element representation containing key data -* @ext: nftables API extension pointer, filled with matching reference +* pipapo_get() - Get matching element reference given key data +* @m: storage containing the set elements +* @data: Key data to be matched against existing elements +* @genmask: If set, check that element is active in given genmask +* @tstamp: timestamp to check for expired elements * * For more details, see DOC: Theory of Operation. * -* Return: true on match, false otherwise. +* This is the main lookup function. It matches key data against either +* the working match set or the uncommitted copy, depending on what the +* caller passed to us. +* nft_pipapo_get (lookup from userspace/control plane) and nft_pipapo_lookup +* (datapath lookup) pass the active copy. +* The insertion path will pass the uncommitted working copy. +* +* Return: pointer to &struct nft_pipapo_elem on match, NULL otherwise. */ -const struct nft_set_ext * -nft_pipapo_lookup (const struct net *net,const struct nft_set *set, -const u32 *key) +static struct nft_pipapo_elem *pipapo_get (const struct nft_pipapo_match *m, +const u8 *data,u8 genmask, +u64 tstamp) { -struct nft_pipapo *priv =nft_set_priv (set);struct nft_pipapo_scratch *scratch;unsigned long *res_map, *fill_map; -u8 genmask =nft_genmask_cur (net); -const struct nft_pipapo_match *m;const struct nft_pipapo_field *f; -const u8 *rp = (const u8 *)key;bool map_index;int i;local_bh_disable (); - m =rcu_dereference (priv->match); - -if (unlikely (!m || !*raw_cpu_ptr (m->scratch))) +if (unlikely (!raw_cpu_ptr (m->scratch))) goto out; scratch = *raw_cpu_ptr (m->scratch);
@@ -445,12 +446,12 @@ nft_pipapo_lookup(const struct net *net, const struct nft_set *set,* packet bytes value, then AND bucket value */ if (likely (f->bb ==8 )) -pipapo_and_field_buckets_8bit (f, res_map, rp); +pipapo_and_field_buckets_8bit (f, res_map, data);else -pipapo_and_field_buckets_4bit (f, res_map, rp); +pipapo_and_field_buckets_4bit (f, res_map, data);NFT_PIPAPO_GROUP_BITS_ARE_8_OR_4 ; - rp += f->groups /NFT_PIPAPO_GROUPS_PER_BYTE (f); + data += f->groups /NFT_PIPAPO_GROUPS_PER_BYTE (f);/* Now populate the bitmap for the next field, unless this is * the last field, in which case return the matched 'ext'
@@ -470,11 +471,11 @@ nft_pipapo_lookup(const struct net *net, const struct nft_set *set, }if (last) { -const struct nft_set_ext *ext; +struct nft_pipapo_elem *e; - ext = &f->mt[b].e->ext; -if (unlikely (nft_set_elem_expired (ext) || - !nft_set_elem_active (ext, genmask))) + e = f->mt[b].e; +if (unlikely (__nft_set_elem_expired (&e->ext, tstamp) || + !nft_set_elem_active (&e->ext, genmask))) goto next_match;/* Last field: we're just returning the key without
@@ -484,8 +485,7 @@ nft_pipapo_lookup(const struct net *net, const struct nft_set *set,*/ scratch->map_index = map_index;local_bh_enable (); - -return ext; +return e; }/* Swap bitmap indices: res_map is the initial bitmap for the
@@ -495,7 +495,7 @@ nft_pipapo_lookup(const struct net *net, const struct nft_set *set, map_index = !map_index;swap (res_map, fill_map); - rp +=NFT_PIPAPO_GROUPS_PADDING (f); + data +=NFT_PIPAPO_GROUPS_PADDING (f); } out:
@@ -504,99 +504,29 @@ nft_pipapo_lookup(const struct net *net, const struct nft_set *set, }/** -* pipapo_get() - Get matching element reference given key data -* @m: storage containing active/existing elements -* @data: Key data to be matched against existing elements -* @genmask: If set, check that element is active in given genmask -* @tstamp: timestamp to check for expired elements -* @gfp: the type of memory to allocate (see kmalloc). +* nft_pipapo_lookup() - Dataplane fronted for main lookup function +* @net: Network namespace +* @set: nftables API set representation +* @key: pointer to nft registers containing key data * -* This is essentially the same as the lookup function, except that it matches -* key data against the uncommitted copy and doesn't use preallocated maps for -* bitmap results. +* This function is called from the data path. It will search for +* an element matching the given key in the current active copy. * -* Return: pointer to &struct nft_pipapo_elem on match, error pointer otherwise. +* Return: ntables API extension pointer or NULL if no match. */ -static struct nft_pipapo_elem *pipapo_get (const struct nft_pipapo_match *m, -const u8 *data,u8 genmask, -u64 tstamp,gfp_t gfp) +const struct nft_set_ext * +nft_pipapo_lookup (const struct net *net,const struct nft_set *set, +const u32 *key) { -struct nft_pipapo_elem *ret =ERR_PTR (-ENOENT ); -unsigned long *res_map, *fill_map =NULL ; -const struct nft_pipapo_field *f; -int i; - -if (m->bsize_max ==0 ) -return ret; - - res_map =kmalloc_array (m->bsize_max,sizeof (*res_map), gfp); -if (!res_map) { - ret =ERR_PTR (-ENOMEM ); - goto out; - } - - fill_map =kcalloc (m->bsize_max,sizeof (*res_map), gfp); -if (!fill_map) { - ret =ERR_PTR (-ENOMEM ); - goto out; - } - -pipapo_resmap_init (m, res_map); - -nft_pipapo_for_each_field (f, i, m) { -bool last = i == m->field_count -1 ; -int b; - -/* For each bit group: select lookup table bucket depending on -* packet bytes value, then AND bucket value -*/ -if (f->bb ==8 ) -pipapo_and_field_buckets_8bit (f, res_map, data); -else if (f->bb ==4 ) -pipapo_and_field_buckets_4bit (f, res_map, data); -else -BUG (); - - data += f->groups /NFT_PIPAPO_GROUPS_PER_BYTE (f); - -/* Now populate the bitmap for the next field, unless this is -* the last field, in which case return the matched 'ext' -* pointer if any. -* -* Now res_map contains the matching bitmap, and fill_map is the -* bitmap for the next field. -*/ -next_match: - b =pipapo_refill (res_map, f->bsize, f->rules, fill_map, f->mt, - last); -if (b <0 ) - goto out; - -if (last) { -if (__nft_set_elem_expired (&f->mt[b].e->ext, tstamp)) - goto next_match; -if ((genmask && - !nft_set_elem_active (&f->mt[b].e->ext, genmask))) - goto next_match; - - ret = f->mt[b].e; - goto out; - } - - data +=NFT_PIPAPO_GROUPS_PADDING (f); +struct nft_pipapo *priv =nft_set_priv (set); +u8 genmask =nft_genmask_cur (net); +const struct nft_pipapo_match *m; +const struct nft_pipapo_elem *e; -/* Swap bitmap indices: fill_map will be the initial bitmap for -* the next field (i.e. the new res_map), and res_map is -* guaranteed to be all-zeroes at this point, ready to be filled -* according to the next mapping table. -*/ -swap (res_map, fill_map); - } + m =rcu_dereference (priv->match); + e =pipapo_get (m, (const u8 *)key, genmask,get_jiffies_64 ()); -out: -kfree (fill_map); -kfree (res_map); -return ret; +return e ? &e->ext :NULL ; }/**
@@ -605,6 +535,11 @@ static struct nft_pipapo_elem *pipapo_get(const struct nft_pipapo_match *m,* @set: nftables API set representation * @elem: nftables API element representation containing key data * @flags: Unused +* +* This function is called from the control plane path under +* RCU read lock. +* +* Return: set element private pointer or ERR_PTR(-ENOENT). */ static struct nft_elem_priv * nft_pipapo_get(const struct net *net, const struct nft_set *set,
@@ -615,10 +550,9 @@ nft_pipapo_get(const struct net *net, const struct nft_set *set,struct nft_pipapo_elem *e; e =pipapo_get (m, (const u8 *)elem->key.val.data, -nft_genmask_cur (net),get_jiffies_64 (), -GFP_ATOMIC ); -if (IS_ERR (e)) -return ERR_CAST (e); +nft_genmask_cur (net),get_jiffies_64 ()); +if (!e) +return ERR_PTR (-ENOENT );return &e->priv; }
@@ -1344,8 +1278,8 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,else end = start; - dup =pipapo_get (m, start, genmask, tstamp,GFP_KERNEL ); -if (!IS_ERR (dup)) { + dup =pipapo_get (m, start, genmask, tstamp); +if (dup) {/* Check if we already have the same exact entry */ const struct nft_data *dup_key, *dup_end;
@@ -1364,15 +1298,9 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,return -ENOTEMPTY ; } -if (PTR_ERR (dup) == -ENOENT ) { -/* Look for partially overlapping entries */ - dup =pipapo_get (m, end,nft_genmask_next (net), tstamp, -GFP_KERNEL ); - } - -if (PTR_ERR (dup) != -ENOENT ) { -if (IS_ERR (dup)) -return PTR_ERR (dup); +/* Look for partially overlapping entries */ + dup =pipapo_get (m, end,nft_genmask_next (net), tstamp); +if (dup) { *elem_priv = &dup->priv;return -ENOTEMPTY ; }
@@ -1914,8 +1842,8 @@ nft_pipapo_deactivate(const struct net *net, const struct nft_set *set,return NULL ; e =pipapo_get (m, (const u8 *)elem->key.val.data, -nft_genmask_next (net),nft_net_tstamp (net),GFP_KERNEL ); -if (IS_ERR (e)) +nft_genmask_next (net),nft_net_tstamp (net)); +if (!e)return NULL ;nft_set_elem_change_active (net, set, &e->ext);
Signature · 1 line
2.49.0
Florian Westphal
maintainerPATCH v2 5/5 netfilter: nft_set_pipapo: prefer kvmalloc for scratch maps
In reply to Florian WestphalThe scratchmap size depends on the number of elements in the set. For huge sets, each scratch map can easily require very large allocations, e.g. for 100k entries each scratch map will require close to 64kbyte of memory.
---
no changes.
net/netfilter/nft_set_pipapo.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/netfilter/nft_set_pipapo.c +4 -5
@@ -1152,7 +1152,7 @@ static void pipapo_free_scratch(const struct nft_pipapo_match *m, unsigned int c mem = s; mem -= s->align_off; -kfree (mem); +kvfree (mem); }/**
@@ -1173,10 +1173,9 @@ static int pipapo_realloc_scratch(struct nft_pipapo_match *clone,void *scratch_aligned;u32 align_off;#endif - scratch =kzalloc_node (struct_size (scratch, map, - bsize_max *2 ) + -NFT_PIPAPO_ALIGN_HEADROOM , -GFP_KERNEL_ACCOUNT ,cpu_to_node (i)); + scratch =kvzalloc_node (struct_size (scratch, map, bsize_max *2 ) + +NFT_PIPAPO_ALIGN_HEADROOM , +GFP_KERNEL_ACCOUNT ,cpu_to_node (i));if (!scratch) {/* On failure, there's no need to undo previous * allocations: this means that some scratch maps have
Signature · 1 line
2.49.0
Pablo Neira Ayuso
maintainerHi Florian,
Quoted 7 lines · Florian Westphal
v2: minor kdoc updates. I copied Stefanos RvB tags.
This series serves as preparation to make pipapos avx2 functions available from the control plane.
First patch removes a few unused arguments.
Second and third patch simplify some of the set api functions.
Although it is a bit lengthy, I like this simplification.
Quoted 4 lines
The fourth patch is the main change, it removes the control-plane only C implementation of the pipapo lookup algorithm.
The last patch allows the scratch maps to be backed by vmalloc.
This clashes with:
netfilter: nft_set_pipapo: Use nested-BH locking for nft_pipapo_scratch
https://patchwork.ozlabs.org/project/netfilter-devel/list/?series=463248
It seems you and Sebastian have been working on the same area at the same time.
Do you have a preference on how to proceed with this clash?
Florian Westphal
maintainerQuoted 7 lines · Pablo Neira Ayuso
Quoted 4 lines
The fourth patch is the main change, it removes the control-plane only C implementation of the pipapo lookup algorithm.
The last patch allows the scratch maps to be backed by vmalloc.
This clashes with:
Quoted 8 lines
netfilter:
nft_set_pipapo: Use nested-BH locking fornft_pipapo_scratchhttps://patchwork.ozlabs.org/project/netfilter-devel/list/?series=463248
It seems you and Sebastian have been working on the same area at the same time.
Do you have a preference on how to proceed with this clash?
If the clash is only in last patch, then how about this:
You apply the first few patches plus Sebastians work, push this out (main or testing branch is fine too) and I will rebase + resend?
Or, we can defer to 6.18, your call.
Pablo Neira Ayuso
maintainerQuoted 12 lines · Florian Westphal
Quoted 11 lines · Pablo Neira Ayuso
Quoted 4 lines
The fourth patch is the main change, it removes the control-plane only C implementation of the pipapo lookup algorithm.
The last patch allows the scratch maps to be backed by vmalloc.
This clashes with:
netfilter:
nft_set_pipapo: Use nested-BH locking fornft_pipapo_scratchhttps://patchwork.ozlabs.org/project/netfilter-devel/list/?series=463248
Quoted 8 lines
Quoted 4 lines
It seems you and Sebastian have been working on the same area at the same time.
Do you have a preference on how to proceed with this clash?
If the clash is only in last patch, then how about this:
You apply the first few patches plus Sebastians work, push this out (main or testing branch is fine too) and I will rebase + resend?
Testing branch:
https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git/log/?h=testing
I still have to make another pass on patchwork, regarding your work, there is one series of you to avoid the GFP_KERNEL allocation I would like to review.
Quoted 1 line
Or, we can defer to 6.18, your call.