From: Joel Fernandes (Google) <joel@joelfernandes.org>
Date: Tue, 16 Jul 2019 22:12:24 +0000 (-0400)
Subject: ipv4: Add lockdep condition to fix for_each_entry()
X-Git-Tag: Ubuntu-5.10.0-12.13~4567^2~1^2^2~50^3~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7fd69b0ba48a2b2d8e5b4f0945b28d3839a7705a;p=mirror_ubuntu-hirsute-kernel.git

ipv4: Add lockdep condition to fix for_each_entry()

This commit applies the consolidated list_for_each_entry_rcu() support
for lockdep conditions.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
---

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index e8bc939b56dd..dde77f72e03e 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -124,7 +124,8 @@ struct fib_table *fib_get_table(struct net *net, u32 id)
 	h = id & (FIB_TABLE_HASHSZ - 1);
 
 	head = &net->ipv4.fib_table_hash[h];
-	hlist_for_each_entry_rcu(tb, head, tb_hlist) {
+	hlist_for_each_entry_rcu(tb, head, tb_hlist,
+				 lockdep_rtnl_is_held()) {
 		if (tb->tb_id == id)
 			return tb;
 	}