infiniband: remove dev_base_lock use

Eric Dumazet · davem330 · commit 22f4fbd9bd28 · 2010-11-24T11:41:56.000-08:00
dev_base_lock is the legacy way to lock the device list, and is planned
to disappear. (writers hold RTNL, readers hold RCU lock)

Convert rdma_translate_ip() and update_ipv6_gids() to RCU locking.

Signed-off-by: Eric Dumazet &lt;eric.dumazet@gmail.com&gt;
Acked-by: Roland Dreier &lt;rolandd@cisco.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
@@ -130,16 +130,16 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
 
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 	case AF_INET6:
-		read_lock(&dev_base_lock);
-		for_each_netdev(&init_net, dev) {
+		rcu_read_lock();
+		for_each_netdev_rcu(&init_net, dev) {
 			if (ipv6_chk_addr(&init_net,
 					  &((struct sockaddr_in6 *) addr)->sin6_addr,
 					  dev, 1)) {
 				ret = rdma_copy_addr(dev_addr, dev, NULL);
 				break;
 			}
 		}
-		read_unlock(&dev_base_lock);
+		rcu_read_unlock();
 		break;
 #endif
 	}
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
@@ -848,8 +848,8 @@ static int update_ipv6_gids(struct mlx4_ib_dev *dev, int port, int clear)
 		goto out;
 	}
 
-	read_lock(&dev_base_lock);
-	for_each_netdev(&init_net, tmp) {
+	rcu_read_lock();
+	for_each_netdev_rcu(&init_net, tmp) {
 		if (ndev && (tmp == ndev || rdma_vlan_dev_real_dev(tmp) == ndev)) {
 			gid.global.subnet_prefix = cpu_to_be64(0xfe80000000000000LL);
 			vid = rdma_vlan_dev_vlan_id(tmp);
@@ -884,7 +884,7 @@ static int update_ipv6_gids(struct mlx4_ib_dev *dev, int port, int clear)
 			}
 		}
 	}
-	read_unlock(&dev_base_lock);
+	rcu_read_unlock();
 
 	for (i = 0; i < 128; ++i)
 		if (!hits[i]) {

Original file line number	Diff line number	Diff line change
`@@ -130,16 +130,16 @@ int rdma_translate_ip(struct sockaddr addr, struct rdma_dev_addr dev_addr)`
`130`	`130`
`131`	`131`	`#if defined(CONFIG_IPV6) \|\| defined(CONFIG_IPV6_MODULE)`
`132`	`132`	`case AF_INET6:`
`133`		`- read_lock(&dev_base_lock);`
`134`		`- for_each_netdev(&init_net, dev) {`
	`133`	`+ rcu_read_lock();`
	`134`	`+ for_each_netdev_rcu(&init_net, dev) {`
`135`	`135`	`if (ipv6_chk_addr(&init_net,`
`136`	`136`	`&((struct sockaddr_in6 *) addr)->sin6_addr,`
`137`	`137`	`dev, 1)) {`
`138`	`138`	`ret = rdma_copy_addr(dev_addr, dev, NULL);`
`139`	`139`	`break;`
`140`	`140`	`}`
`141`	`141`	`}`
`142`		`- read_unlock(&dev_base_lock);`
	`142`	`+ rcu_read_unlock();`
`143`	`143`	`break;`
`144`	`144`	`#endif`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -848,8 +848,8 @@ static int update_ipv6_gids(struct mlx4_ib_dev *dev, int port, int clear)`
`848`	`848`	`goto out;`
`849`	`849`	`}`
`850`	`850`
`851`		`- read_lock(&dev_base_lock);`
`852`		`- for_each_netdev(&init_net, tmp) {`
	`851`	`+ rcu_read_lock();`
	`852`	`+ for_each_netdev_rcu(&init_net, tmp) {`
`853`	`853`	`if (ndev && (tmp == ndev \|\| rdma_vlan_dev_real_dev(tmp) == ndev)) {`
`854`	`854`	`gid.global.subnet_prefix = cpu_to_be64(0xfe80000000000000LL);`
`855`	`855`	`vid = rdma_vlan_dev_vlan_id(tmp);`
`@@ -884,7 +884,7 @@ static int update_ipv6_gids(struct mlx4_ib_dev *dev, int port, int clear)`
`884`	`884`	`}`
`885`	`885`	`}`
`886`	`886`	`}`
`887`		`- read_unlock(&dev_base_lock);`
	`887`	`+ rcu_read_unlock();`
`888`	`888`
`889`	`889`	`for (i = 0; i < 128; ++i)`
`890`	`890`	`if (!hits[i]) {`