| Message ID | 20190715143705.117908-5-joel@joelfernandes.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | Harden list_for_each_entry_rcu() and family | expand |
On Mon, Jul 15, 2019 at 10:37:00AM -0400, Joel Fernandes (Google) wrote: > Using the previous support added, use it for adding lockdep conditions > to list usage here. > > Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org> We need an ack or better from the subsystem maintainer for this one. Thanx, Paul > --- > net/ipv4/fib_frontend.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c > index 317339cd7f03..26b0fb24e2c2 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; > } > -- > 2.22.0.510.g264f2c817a-goog >
From: "Paul E. McKenney" <paulmck@linux.ibm.com> Date: Tue, 16 Jul 2019 11:39:55 -0700 > On Mon, Jul 15, 2019 at 10:37:00AM -0400, Joel Fernandes (Google) wrote: >> Using the previous support added, use it for adding lockdep conditions >> to list usage here. >> >> Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org> > > We need an ack or better from the subsystem maintainer for this one. Acked-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 317339cd7f03..26b0fb24e2c2 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; }
Using the previous support added, use it for adding lockdep conditions to list usage here. Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org> --- net/ipv4/fib_frontend.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)