[PATCH] net: core: sock_map: Use built-in RCU list checking

From: madhuparnabhowmik10
Date: Fri Feb 21 2020 - 12:04:04 EST


From: Madhuparna Bhowmik <madhuparnabhowmik10@xxxxxxxxx>

hlist_for_each_entry_rcu() has built-in RCU and lock checking.

Pass cond argument to list_for_each_entry_rcu() to silence
false lockdep warning when CONFIG_PROVE_RCU_LIST is enabled
by default.

Signed-off-by: Madhuparna Bhowmik <madhuparnabhowmik10@xxxxxxxxx>
---
net/core/sock_map.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index eb114ee419b6..c1549f189b0d 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -546,7 +546,7 @@ sock_hash_lookup_elem_raw(struct hlist_head *head, u32 hash, void *key,
{
struct bpf_htab_elem *elem;

- hlist_for_each_entry_rcu(elem, head, node) {
+ hlist_for_each_entry_rcu(elem, head, node, lockdep_is_held(&bucket->lock)) {
if (elem->hash == hash &&
!memcmp(&elem->key, key, key_size))
return elem;
--
2.17.1