rhashtable: Do hashing inside of rhashtable_lookup_compare()

Hash the key inside of rhashtable_lookup_compare() like
rhashtable_lookup() does. This allows to simplify the hashing
functions and keep them private.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Cc: netfilter-devel@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 29 insertions, 17 deletions

diff --git a/net/netfilter/nft_hash.c b/net/netfilter/nft_hash.c
index 1e316ce4cb5d..614ee099ba36 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);
+
+                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;
 }