leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: nf_tables: use rhashtable_lookup() instead of rhashtable_lookup_fast()

Browse Source 
Internally, rhashtable_lookup_fast() calls rcu_read_lock() then,
calls rhashtable_lookup(). so that in places where are guaranteed
by rcu read lock, rhashtable_lookup() is enough.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Taehee Yoo 2018-09-25 00:39:27 +09:00 committed by Pablo Neira Ayuso
parent 28c5ed2f93
commit a2d88182d2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/nf_flow_table_core.c
View File

@ -233,8 +233,8 @@ flow_offload_lookup(struct nf_flowtable *flow_table,
struct flow_offload *flow; struct flow_offload *flow;
int dir; int dir;
tuplehash = rhashtable_lookup_fast(&flow_table->rhashtable, tuple, tuplehash = rhashtable_lookup(&flow_table->rhashtable, tuple,
nf_flow_offload_rhash_params); nf_flow_offload_rhash_params);
if (!tuplehash) if (!tuplehash)
return NULL; return NULL;

8
net/netfilter/nft_set_hash.c
View File

@ -88,7 +88,7 @@ static bool nft_rhash_lookup(const struct net *net, const struct nft_set *set,
.key = key, .key = key,
}; };
he = rhashtable_lookup_fast(&priv->ht, &arg, nft_rhash_params); he = rhashtable_lookup(&priv->ht, &arg, nft_rhash_params);
if (he != NULL) if (he != NULL)
*ext = &he->ext; *ext = &he->ext;
@ -106,7 +106,7 @@ static void *nft_rhash_get(const struct net *net, const struct nft_set *set,
.key = elem->key.val.data, .key = elem->key.val.data,
}; };
he = rhashtable_lookup_fast(&priv->ht, &arg, nft_rhash_params); he = rhashtable_lookup(&priv->ht, &arg, nft_rhash_params);
if (he != NULL) if (he != NULL)
return he; return he;
@ -129,7 +129,7 @@ static bool nft_rhash_update(struct nft_set *set, const u32 *key,
.key = key, .key = key,
}; };
he = rhashtable_lookup_fast(&priv->ht, &arg, nft_rhash_params); he = rhashtable_lookup(&priv->ht, &arg, nft_rhash_params);
if (he != NULL) if (he != NULL)
goto out; goto out;
@ -217,7 +217,7 @@ static void *nft_rhash_deactivate(const struct net *net,
}; };
rcu_read_lock(); rcu_read_lock();
he = rhashtable_lookup_fast(&priv->ht, &arg, nft_rhash_params); he = rhashtable_lookup(&priv->ht, &arg, nft_rhash_params);
if (he != NULL && if (he != NULL &&
!nft_rhash_flush(net, set, he)) !nft_rhash_flush(net, set, he))
he = NULL; he = NULL;