net: use rhashtable_lookup() instead of rhashtable_lookup_fast()
Subsystems (9)
PATCH 1/1 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 Taehee Yoo <[email protected]>
--- drivers/infiniband/hw/hfi1/sdma.c | 4 ++-- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +- drivers/net/ethernet/netronome/nfp/bpf/offload.c | 4 ++-- net/tipc/socket.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/infiniband/hw/hfi1/sdma.c +2 -2
@@ -881,8 +881,8 @@ 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, - sdma_rht_params); + rht_node =rhashtable_lookup (dd->sdma_rht, &cpu_id, + sdma_rht_params);if (rht_node && rht_node->map[vl]) {struct sdma_rht_map_elem *map = rht_node->map[vl];
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +1 -1
@@ -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
@@ -458,8 +458,8 @@ 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, - nfp_bpf_maps_neutral_params); + record =rhashtable_lookup (&bpf->maps_neutral, &map_id, + nfp_bpf_maps_neutral_params);if (!record || map_id_full >U32_MAX ) {rcu_read_unlock (); cmsg_warn(bpf, "perf event: map id %lld (0x%llx) not recognized, dropping event\n",
net/tipc/socket.c +1 -1
@@ -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 ();
Signature · 1 line
2.17.1
Jakub Kicinski
AppliedQuoted 5 lines · Taehee Yoo
rhashtable_lookup_fast()internally callsrcu_read_lock()then, callsrhashtable_lookup(). So ifrcu_read_lock()is already held,rhashtable_lookup()is enough.Signed-off-by Taehee Yoo <[email protected]>
Applied, thanks!