Le jeudi 18 novembre 2010 Ã 14:48 +0530, Sachin Sant a Ãcrit : > Commit 1d7138de878d1d4210727c1200193e69596f93b3 > igmp: RCU conversion of in_dev->mc_list > > converted rwlock to RCU. > > Update the s390 network drivers(qeth & lcs) code to adapt to this change. > > Signed-off-by : Sachin Sant <sachinp@xxxxxxxxxx> > --- > > Only compile tested. > Hmm, sorry but this wont work. > diff -Narup linux-2.6-next/drivers/s390/net/lcs.c linux-2.6-next-new/drivers/s390/net/lcs.c > --- linux-2.6-next/drivers/s390/net/lcs.c 2010-11-17 11:38:25.000000000 +0530 > +++ linux-2.6-next-new/drivers/s390/net/lcs.c 2010-11-18 11:59:46.000000000 +0530 > @@ -1269,10 +1269,10 @@ lcs_register_mc_addresses(void *data) > in4_dev = in_dev_get(card->dev); > if (in4_dev == NULL) > goto out; > - read_lock(&in4_dev->mc_list_lock); > + rcu_read_lock(); If you use rcu_read_lock(), then you also need to use the rcu list iterators in lcs_remove_mc_addresses() and lcs_set_mc_addresses() Then, its strange this driver is not protected by RTNL at this stage. Ah yes, it uses a kthread from its ndo_set_multicast_list() handler. This seems not safe at all. > lcs_remove_mc_addresses(card,in4_dev); > lcs_set_mc_addresses(card, in4_dev); > - read_unlock(&in4_dev->mc_list_lock); > + rcu_read_unlock(); > in_dev_put(in4_dev); > > netif_carrier_off(card->dev); > diff -Narup linux-2.6-next/drivers/s390/net/qeth_l3_main.c linux-2.6-next-new/drivers/s390/net/qeth_l3_main.c > --- linux-2.6-next/drivers/s390/net/qeth_l3_main.c 2010-10-30 12:54:22.000000000 +0530 > +++ linux-2.6-next-new/drivers/s390/net/qeth_l3_main.c 2010-11-18 11:59:13.000000000 +0530 > @@ -1828,9 +1828,9 @@ static void qeth_l3_add_vlan_mc(struct q > in_dev = in_dev_get(netdev); > if (!in_dev) > continue; > - read_lock(&in_dev->mc_list_lock); > + rcu_read_lock(); > qeth_l3_add_mc(card, in_dev); > - read_unlock(&in_dev->mc_list_lock); > + rcu_read_unlock(); > in_dev_put(in_dev); > } > } > @@ -1843,10 +1843,10 @@ static void qeth_l3_add_multicast_ipv4(s > in4_dev = in_dev_get(card->dev); > if (in4_dev == NULL) > return; > - read_lock(&in4_dev->mc_list_lock); > + rcu_read_lock(); > qeth_l3_add_mc(card, in4_dev); > qeth_l3_add_vlan_mc(card); > - read_unlock(&in4_dev->mc_list_lock); > + rcu_read_unlock(); > in_dev_put(in4_dev); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
