Commit ab818362 authored by Taehee Yoo's avatar Taehee Yoo Committed by Jakub Kicinski
Browse files

net: use rhashtable_lookup() instead of rhashtable_lookup_fast() 



rhashtable_lookup_fast() internally calls rcu_read_lock() then,
calls rhashtable_lookup(). So if rcu_read_lock() is already held,
rhashtable_lookup() is enough.

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parent 3a06ee33

drivers/infiniband/hw/hfi1/sdma.c

+2 −2
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ struct sdma_engine *sdma_select_user_engine(struct hfi1_devdata *dd, 


	cpu_id = smp_processor_id();

	rcu_read_lock();

	rht_node = rhashtable_lookup_fast(dd->sdma_rht, &cpu_id,

	rht_node = rhashtable_lookup(dd->sdma_rht, &cpu_id,

				     sdma_rht_params);



	if (rht_node && rht_node->map[vl]) {

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+1 −1
Original line number Diff line number Diff line
@@ -3876,7 +3876,7 @@ int mlx5e_delete_flower(struct net_device *dev, struct mlx5e_priv *priv, 
	int err;



	rcu_read_lock();

	flow = rhashtable_lookup_fast(tc_ht, &f->cookie, tc_ht_params);

	flow = rhashtable_lookup(tc_ht, &f->cookie, tc_ht_params);

	if (!flow || !same_flow_direction(flow, flags)) {

		err = -EINVAL;

		goto errout;

drivers/net/ethernet/netronome/nfp/bpf/offload.c

+2 −2
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ int nfp_bpf_event_output(struct nfp_app_bpf *bpf, const void *data, 
		return -EINVAL;



	rcu_read_lock();

	record = rhashtable_lookup_fast(&bpf->maps_neutral, &map_id,

	record = rhashtable_lookup(&bpf->maps_neutral, &map_id,

				   nfp_bpf_maps_neutral_params);

	if (!record || map_id_full > U32_MAX) {

		rcu_read_unlock();

net/tipc/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -2880,7 +2880,7 @@ static struct tipc_sock *tipc_sk_lookup(struct net *net, u32 portid) 
	struct tipc_sock *tsk;



	rcu_read_lock();

	tsk = rhashtable_lookup_fast(&tn->sk_rht, &portid, tsk_rht_params);

	tsk = rhashtable_lookup(&tn->sk_rht, &portid, tsk_rht_params);

	if (tsk)

		sock_hold(&tsk->sk);

	rcu_read_unlock();