lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 16 Jan 2015 15:37:40 +0000 From: Patrick McHardy <kaber@...sh.net> To: Thomas Graf <tgraf@...g.ch> Cc: davem@...emloft.net, netdev@...r.kernel.org, linux-kernel@...r.kernel.org, herbert@...dor.apana.org.au, paulmck@...ux.vnet.ibm.com, edumazet@...gle.com, john.r.fastabend@...el.com, josh@...htriplett.org, netfilter-devel@...r.kernel.org Subject: Re: [PATCH 1/9] rhashtable: Do hashing inside of rhashtable_lookup_compare() On 02.01, Thomas Graf wrote: > Hash the key inside of rhashtable_lookup_compare() like > rhashtable_lookup() does. This allows to simplify the hashing > functions and keep them private. One more question: > diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c > index 1e316ce..614ee09 100644 > --- a/net/netfilter/nft_hash.c > +++ b/net/netfilter/nft_hash.c > @@ -94,28 +94,40 @@ static void nft_hash_remove(const struct nft_set *set, > kfree(he); > } > > +struct nft_compare_arg { > + const struct nft_set *set; > + struct nft_set_elem *elem; > +}; > + > +static bool nft_hash_compare(void *ptr, void *arg) > +{ > + struct nft_hash_elem *he = ptr; > + struct nft_compare_arg *x = arg; > + > + if (!nft_data_cmp(&he->key, &x->elem->key, x->set->klen)) { > + x->elem->cookie = &he->node; > + x->elem->flags = 0; > + if (x->set->flags & NFT_SET_MAP) > + nft_data_copy(&x->elem->data, he->data); Is there any reason why we need to perform the assignments in the compare function? The reason why I'm asking is because to add timeout support, I need another compare function for nft_hash_lookup() and I'd prefer to use a single one for both cases. > + > + return true; > + } > + > + return false; > +} > + > static int nft_hash_get(const struct nft_set *set, struct nft_set_elem *elem) > { > const struct rhashtable *priv = nft_set_priv(set); > - const struct bucket_table *tbl = rht_dereference_rcu(priv->tbl, priv); > - struct rhash_head __rcu * const *pprev; > - struct nft_hash_elem *he; > - u32 h; > - > - h = rhashtable_hashfn(priv, &elem->key, set->klen); > - pprev = &tbl->buckets[h]; > - rht_for_each_entry_rcu(he, tbl->buckets[h], node) { > - if (nft_data_cmp(&he->key, &elem->key, set->klen)) { > - pprev = &he->node.next; > - continue; > - } > + struct nft_compare_arg arg = { > + .set = set, > + .elem = elem, > + }; > > - elem->cookie = (void *)pprev; > - elem->flags = 0; > - if (set->flags & NFT_SET_MAP) > - nft_data_copy(&elem->data, he->data); > + if (rhashtable_lookup_compare(priv, &elem->key, > + &nft_hash_compare, &arg)) > return 0; > - } > + > return -ENOENT; > } > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists