[PATCH] net: core: sock_map: Use built-in RCU list checking
From: <hidden>
Date: 2020-02-21 17:04:04
Also in:
bpf, linux-kernel-mentees, lkml
Subsystem:
bpf [l7 framework] (sockmap), networking [general], networking [sockets], the rest · Maintainers:
John Fastabend, Jakub Sitnicki, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Kuniyuki Iwashima, Willem de Bruijn, Linus Torvalds
From: Madhuparna Bhowmik <redacted> 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 <redacted> --- 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