Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a776628 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

netfilter: Use rhashtable walk iterator 



This patch gets rid of the manual rhashtable walk in nft_hash
which touches rhashtable internals that should not be exposed.
It does so by using the rhashtable iterator primitives.

Note that I'm leaving nft_hash_destroy alone since it's only
invoked on shutdown and it shouldn't be affected by changes
to rhashtable internals (or at least not what I'm planning to
change).

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56d28b1e

net/netfilter/nft_hash.c

+36 −17
Original line number Diff line number Diff line
@@ -130,16 +130,31 @@ static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set, 
			  struct nft_set_iter *iter)

{

	struct rhashtable *priv = nft_set_priv(set);

	const struct bucket_table *tbl;

	const struct nft_hash_elem *he;

	struct rhashtable_iter hti;

	struct nft_set_elem elem;

	unsigned int i;

	int err;



	tbl = rht_dereference_rcu(priv->tbl, priv);

	for (i = 0; i < tbl->size; i++) {

		struct rhash_head *pos;

	err = rhashtable_walk_init(priv, &hti);

	iter->err = err;

	if (err)

		return;



	err = rhashtable_walk_start(&hti);

	if (err && err != -EAGAIN) {

		iter->err = err;

		goto out;

	}



	while ((he = rhashtable_walk_next(&hti))) {

		if (IS_ERR(he)) {

			err = PTR_ERR(he);

			if (err != -EAGAIN) {

				iter->err = err;

				goto out;

			}

		}



		rht_for_each_entry_rcu(he, pos, tbl, i, node) {

		if (iter->count < iter->skip)

			goto cont;
@@ -150,11 +165,15 @@ static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set, 


		iter->err = iter->fn(ctx, set, iter, &elem);

		if (iter->err < 0)

				return;

			goto out;



cont:

		iter->count++;

	}

	}



out:

	rhashtable_walk_stop(&hti);

	rhashtable_walk_exit(&hti);

}



static unsigned int nft_hash_privsize(const struct nlattr * const nla[])