Commit 745f5450 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nft_hash: restore struct nft_hash 



Following patches will add new private members, restore struct nft_hash
as preparation.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 49f7b33e

net/netfilter/nft_hash.c

+21 −16
Original line number Original line Diff line number Diff line
@@ -23,6 +23,10 @@ 
/* 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_HASH_ELEMENT_HINT 3





struct nft_hash {

	struct rhashtable		ht;

};



struct nft_hash_elem {

struct nft_hash_elem {

	struct rhash_head		node;

	struct rhash_head		node;

	struct nft_data			key;

	struct nft_data			key;
@@ -35,10 +39,10 @@ static bool nft_hash_lookup(const struct nft_set *set, 
			    const struct nft_data *key,

			    const struct nft_data *key,

			    struct nft_data *data)

			    struct nft_data *data)

{

{

	struct rhashtable *priv = nft_set_priv(set);

	struct nft_hash *priv = nft_set_priv(set);

	const struct nft_hash_elem *he;

	const struct nft_hash_elem *he;





	he = rhashtable_lookup_fast(priv, key, nft_hash_params);

	he = rhashtable_lookup_fast(&priv->ht, key, nft_hash_params);

	if (he && set->flags & NFT_SET_MAP)

	if (he && set->flags & NFT_SET_MAP)

		nft_data_copy(data, he->data);

		nft_data_copy(data, he->data);
@@ -48,7 +52,7 @@ static bool nft_hash_lookup(const struct nft_set *set, 
static int nft_hash_insert(const struct nft_set *set,

static int nft_hash_insert(const struct nft_set *set,

			   const struct nft_set_elem *elem)

			   const struct nft_set_elem *elem)

{

{

	struct rhashtable *priv = nft_set_priv(set);

	struct nft_hash *priv = nft_set_priv(set);

	struct nft_hash_elem *he;

	struct nft_hash_elem *he;

	unsigned int size;

	unsigned int size;

	int err;

	int err;
@@ -68,7 +72,7 @@ static int nft_hash_insert(const struct nft_set *set, 
	if (set->flags & NFT_SET_MAP)

	if (set->flags & NFT_SET_MAP)

		nft_data_copy(he->data, &elem->data);

		nft_data_copy(he->data, &elem->data);





	err = rhashtable_insert_fast(priv, &he->node, nft_hash_params);

	err = rhashtable_insert_fast(&priv->ht, &he->node, nft_hash_params);

	if (err)

	if (err)

		kfree(he);

		kfree(he);
@@ -87,19 +91,19 @@ static void nft_hash_elem_destroy(const struct nft_set *set, 
static void nft_hash_remove(const struct nft_set *set,

static void nft_hash_remove(const struct nft_set *set,

			    const struct nft_set_elem *elem)

			    const struct nft_set_elem *elem)

{

{

	struct rhashtable *priv = nft_set_priv(set);

	struct nft_hash *priv = nft_set_priv(set);





	rhashtable_remove_fast(priv, elem->cookie, nft_hash_params);

	rhashtable_remove_fast(&priv->ht, elem->cookie, nft_hash_params);

	synchronize_rcu();

	synchronize_rcu();

	kfree(elem->cookie);

	kfree(elem->cookie);

}

}





static int nft_hash_get(const struct nft_set *set, struct nft_set_elem *elem)

static int nft_hash_get(const struct nft_set *set, struct nft_set_elem *elem)

{

{

	struct rhashtable *priv = nft_set_priv(set);

	struct nft_hash *priv = nft_set_priv(set);

	struct nft_hash_elem *he;

	struct nft_hash_elem *he;





	he = rhashtable_lookup_fast(priv, &elem->key, nft_hash_params);

	he = rhashtable_lookup_fast(&priv->ht, &elem->key, nft_hash_params);

	if (!he)

	if (!he)

		return -ENOENT;

		return -ENOENT;
@@ -114,13 +118,13 @@ static int nft_hash_get(const struct nft_set *set, struct nft_set_elem *elem) 
static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set,

static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set,

			  struct nft_set_iter *iter)

			  struct nft_set_iter *iter)

{

{

	struct rhashtable *priv = nft_set_priv(set);

	struct nft_hash *priv = nft_set_priv(set);

	const struct nft_hash_elem *he;

	const struct nft_hash_elem *he;

	struct rhashtable_iter hti;

	struct rhashtable_iter hti;

	struct nft_set_elem elem;

	struct nft_set_elem elem;

	int err;

	int err;





	err = rhashtable_walk_init(priv, &hti);

	err = rhashtable_walk_init(&priv->ht, &hti);

	iter->err = err;

	iter->err = err;

	if (err)

	if (err)

		return;

		return;
@@ -165,7 +169,7 @@ static void nft_hash_walk(const struct nft_ctx *ctx, const struct nft_set *set, 




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

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

{

{

	return sizeof(struct rhashtable);

	return sizeof(struct nft_hash);

}

}





static const struct rhashtable_params nft_hash_params = {

static const struct rhashtable_params nft_hash_params = {
@@ -179,13 +183,13 @@ static int nft_hash_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 rhashtable *priv = nft_set_priv(set);

	struct nft_hash *priv = nft_set_priv(set);

	struct rhashtable_params params = nft_hash_params;

	struct rhashtable_params params = nft_hash_params;





	params.nelem_hint = desc->size ?: NFT_HASH_ELEMENT_HINT;

	params.nelem_hint = desc->size ?: NFT_HASH_ELEMENT_HINT;

	params.key_len = set->klen;

	params.key_len = set->klen;





	return rhashtable_init(priv, &params);

	return rhashtable_init(&priv->ht, &params);

}

}





static void nft_free_element(void *ptr, void *arg)

static void nft_free_element(void *ptr, void *arg)
@@ -195,8 +199,9 @@ static void nft_free_element(void *ptr, void *arg) 




static void nft_hash_destroy(const struct nft_set *set)

static void nft_hash_destroy(const struct nft_set *set)

{

{

	rhashtable_free_and_destroy(nft_set_priv(set), nft_free_element,

	struct nft_hash *priv = nft_set_priv(set);

				    (void *)set);



	rhashtable_free_and_destroy(&priv->ht, nft_free_element, (void *)set);

}

}





static bool nft_hash_estimate(const struct nft_set_desc *desc, u32 features,

static bool nft_hash_estimate(const struct nft_set_desc *desc, u32 features,
@@ -209,7 +214,7 @@ static bool nft_hash_estimate(const struct nft_set_desc *desc, u32 features, 
		esize += FIELD_SIZEOF(struct nft_hash_elem, data[0]);

		esize += FIELD_SIZEOF(struct nft_hash_elem, data[0]);





	if (desc->size) {

	if (desc->size) {

		est->size = sizeof(struct rhashtable) +

		est->size = sizeof(struct nft_hash) +

			    roundup_pow_of_two(desc->size * 4 / 3) *

			    roundup_pow_of_two(desc->size * 4 / 3) *

			    sizeof(struct nft_hash_elem *) +

			    sizeof(struct nft_hash_elem *) +

			    desc->size * esize;

			    desc->size * esize;