ipv6: xfrm6_tunnel.c: Use built-in RCU list checking

Madhuparna Bhowmik · klassert · commit edf0d283d988 · 2020-02-27T10:17:41.000+01:00
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 &lt;madhuparnabhowmik10@gmail.com&gt;
Signed-off-by: Steffen Klassert &lt;steffen.klassert@secunet.com&gt;
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
@@ -78,7 +78,7 @@ static struct xfrm6_tunnel_spi *__xfrm6_tunnel_spi_lookup(struct net *net, const
 
 	hlist_for_each_entry_rcu(x6spi,
 			     &xfrm6_tn->spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)],
-			     list_byaddr) {
+			     list_byaddr, lockdep_is_held(&xfrm6_tunnel_spi_lock)) {
 		if (xfrm6_addr_equal(&x6spi->addr, saddr))
 			return x6spi;
 	}

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ static struct xfrm6_tunnel_spi __xfrm6_tunnel_spi_lookup(struct net net, const`
`78`	`78`
`79`	`79`	`hlist_for_each_entry_rcu(x6spi,`
`80`	`80`	`&xfrm6_tn->spi_byaddr[xfrm6_tunnel_spi_hash_byaddr(saddr)],`
`81`		`- list_byaddr) {`
	`81`	`+ list_byaddr, lockdep_is_held(&xfrm6_tunnel_spi_lock)) {`
`82`	`82`	`if (xfrm6_addr_equal(&x6spi->addr, saddr))`
`83`	`83`	`return x6spi;`
`84`	`84`	`}`