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 <ap420073@gmail.com>
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>

diff --git a/drivers/infiniband/hw/hfi1/sdma.c b/drivers/infiniband/hw/hfi1/sdma.c
index c61b6022575e1abe24a4a7bbf67729a0ad140315..5774dfc22e18c8c2bdb0f8ac79daf53d6dbf4e5f 100644 (file)
--- a/drivers/infiniband/hw/hfi1/sdma.c
+++ b/drivers/infiniband/hw/hfi1/sdma.c
@@ -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];

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
index 761fc35c4aabad6d1149b5ce29001b6300955cd4..0d5d84b5fa2367886fc806cd4a704f50fd0f5f3a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
@@ -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;

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index 06927ba5a3ae03611bc8effafea03b9601654a75..95a0d3910e316b42f42c82b66b7256e671432ccf 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -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",

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 5d7859aac78ef99f614a8710ccab521a3bac7818..a1c8d722ca204200b149886e43bf3220089d45ba 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -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();