netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* RTNL: assertion failed at net/core/dev.c (3961)
@ 2009-07-30  8:23 Meelis Roos
  2009-07-30  9:08 ` Eric Dumazet
  0 siblings, 1 reply; 6+ messages in thread
From: Meelis Roos @ 2009-07-30  8:23 UTC (permalink / raw)
  To: netdev

I'm running 2.6.31-rc4 on an i386 pc and got these two similar 
but different in cause assertion failures  on boot. Seems to be 
repeatable. I saw similar messages on a kernel around -rc3 but it had 
SIT troubles so I did not test more earlier rc-s.

This seems to be VLAN+IPv6 related, so some more info on the 
configurartion:

eth0 is plain ethernet, internal LAN, IPv6 address autoconfigured from 
external 6to4 address.

eth1 is ethernet, external interface. Dynamic IPv4, 6to4 tunnel is 
created automatically from it. Only link-local IPv6 on this 
interface. This is untagged, but it also carries VLAN 4 tagged.

eth1.4 is the VLAN on eth1 that carries iptv. Dynamic IPv4, only 
link-local IPv6.

eth2 is plain internal LAN, like eth0 - static IPv4, IPv6 from 6to4.

tun6to4 is sti tunnel for 6to4, cofigured from eth1's IP.

eth0 and eth1 are 8139too, eth2 is uli526x.

RTNL: assertion failed at net/core/dev.c (3961)
Pid: 0, comm: swapper Not tainted 2.6.31-rc4 #327
Call Trace:
 [<c127fd2b>] ? printk+0x1d/0x32
 [<c120c43c>] dev_unicast_sync+0x3b/0xfe
 [<f8a0b19d>] vlan_dev_set_rx_mode+0x2f/0x45 [8021q]
 [<c120bab5>] __dev_set_rx_mode+0x88/0x9e
 [<c1211c48>] dev_mc_add+0x52/0x7c
 [<f890d5d1>] igmp6_group_added+0x5e/0x160 [ipv6]
 [<f8900923>] ? fib6_clean_node+0x0/0x9f [ipv6]
 [<f890d9e6>] ipv6_dev_mc_inc+0x2b9/0x2dc [ipv6]
 [<f88f6745>] addrconf_join_solict+0x43/0x56 [ipv6]
 [<f88f197d>] ipv6_dev_ac_inc+0x15c/0x1ab [ipv6]
 [<f88f5f55>] addrconf_join_anycast+0x82/0x9b [ipv6]
 [<f88f75b4>] __ipv6_ifa_notify+0xd6/0x153 [ipv6]
 [<f88f8584>] ? addrconf_dad_timer+0x0/0x120 [ipv6]
 [<f88f7662>] ipv6_ifa_notify+0x31/0x4c [ipv6]
 [<f88f76a3>] addrconf_dad_completed+0x26/0xb7 [ipv6]
 [<f88f8607>] addrconf_dad_timer+0x83/0x120 [ipv6]
 [<f89fd942>] ? garp_join_timer+0x0/0x79 [garp]
 [<f89fd9a5>] ? garp_join_timer+0x63/0x79 [garp]
 [<c102dbff>] run_timer_softirq+0x152/0x1ca
 [<c1029b9b>] __do_softirq+0x69/0xe6
 [<c1029b32>] ? __do_softirq+0x0/0xe6
 <IRQ>  [<c10298a2>] ? irq_exit+0x36/0x7b
 [<c1012a71>] ? smp_apic_timer_interrupt+0x70/0x8c
 [<c10032a1>] ? apic_timer_interrupt+0x31/0x38
 [<c1008b67>] ? default_idle+0x36/0x5c
 [<c1001cbb>] ? cpu_idle+0x72/0x9f
 [<c1278d08>] ? rest_init+0x74/0x87
 [<c13c9af9>] ? start_kernel+0x278/0x28e
 [<c13c9312>] ? i386_start_kernel+0x40/0x56
ADDRCONF(NETDEV_UP): eth2: link is not ready
powernow-k8: Found 1 AMD Athlon(tm) 64 Processor 3000+ processors (1 cpu 
cores) (version 2.20.00)
powernow-k8:    0 : fid 0xa (1800 MHz), vid 0x6
powernow-k8:    1 : fid 0x2 (1000 MHz), vid 0x12
Marking TSC unstable due to cpufreq changes
RTNL: assertion failed at net/core/dev.c (3961)
Pid: 2744, comm: avahi-daemon Not tainted 2.6.31-rc4 #327
Call Trace:
 [<c127fd2b>] ? printk+0x1d/0x32
 [<c120c43c>] dev_unicast_sync+0x3b/0xfe
 [<f8a0b19d>] vlan_dev_set_rx_mode+0x2f/0x45 [8021q]
 [<c120bab5>] __dev_set_rx_mode+0x88/0x9e
 [<c1211c48>] dev_mc_add+0x52/0x7c
 [<f890d5d1>] igmp6_group_added+0x5e/0x160 [ipv6]
 [<c1202560>] ? sock_alloc_send_pskb+0x9c/0x267
 [<f890d9e6>] ipv6_dev_mc_inc+0x2b9/0x2dc [ipv6]
 [<f890eb15>] ipv6_sock_mc_join+0x15d/0x1ce [ipv6]
 [<f8902565>] do_ipv6_setsockopt+0x8a7/0xc2e [ipv6]
 [<c11ff715>] ? sock_recvmsg+0xdf/0x108
 [<c11ff877>] ? sock_sendmsg+0xd8/0x100
 [<c10384fe>] ? autoremove_wake_function+0x0/0x54
 [<c108eb47>] ? file_update_time+0x9e/0xd0
 [<c11ffba2>] ? sys_sendto+0x10d/0x146
 [<f890293f>] ipv6_setsockopt+0x53/0xb0 [ipv6]
 [<f8905951>] udpv6_setsockopt+0x4c/0x67 [ipv6]
 [<c1201262>] sock_common_setsockopt+0x22/0x38
 [<c11ff150>] sys_setsockopt+0x79/0xa8
 [<c1200cd1>] sys_socketcall+0x129/0x18a
 [<c1002bbb>] sysenter_do_call+0x12/0x26


-- 
Meelis Roos (mroos@linux.ee)

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: RTNL: assertion failed at net/core/dev.c (3961)
  2009-07-30  8:23 RTNL: assertion failed at net/core/dev.c (3961) Meelis Roos
@ 2009-07-30  9:08 ` Eric Dumazet
  2009-07-30 10:08   ` Jiri Pirko
  2009-07-30 11:06   ` [PATCH net-2.6] net: restore the original spinlock to protect unicast list Jiri Pirko
  0 siblings, 2 replies; 6+ messages in thread
From: Eric Dumazet @ 2009-07-30  9:08 UTC (permalink / raw)
  To: Meelis Roos; +Cc: netdev, Jiri Pirko

Meelis Roos a écrit :
> I'm running 2.6.31-rc4 on an i386 pc and got these two similar 
> but different in cause assertion failures  on boot. Seems to be 
> repeatable. I saw similar messages on a kernel around -rc3 but it had 
> SIT troubles so I did not test more earlier rc-s.
> 
> This seems to be VLAN+IPv6 related, so some more info on the 
> configurartion:
> 
> eth0 is plain ethernet, internal LAN, IPv6 address autoconfigured from 
> external 6to4 address.
> 
> eth1 is ethernet, external interface. Dynamic IPv4, 6to4 tunnel is 
> created automatically from it. Only link-local IPv6 on this 
> interface. This is untagged, but it also carries VLAN 4 tagged.
> 
> eth1.4 is the VLAN on eth1 that carries iptv. Dynamic IPv4, only 
> link-local IPv6.
> 
> eth2 is plain internal LAN, like eth0 - static IPv4, IPv6 from 6to4.
> 
> tun6to4 is sti tunnel for 6to4, cofigured from eth1's IP.
> 
> eth0 and eth1 are 8139too, eth2 is uli526x.
> 
> RTNL: assertion failed at net/core/dev.c (3961)
> Pid: 0, comm: swapper Not tainted 2.6.31-rc4 #327
> Call Trace:
>  [<c127fd2b>] ? printk+0x1d/0x32
>  [<c120c43c>] dev_unicast_sync+0x3b/0xfe
>  [<f8a0b19d>] vlan_dev_set_rx_mode+0x2f/0x45 [8021q]
>  [<c120bab5>] __dev_set_rx_mode+0x88/0x9e
>  [<c1211c48>] dev_mc_add+0x52/0x7c
>  [<f890d5d1>] igmp6_group_added+0x5e/0x160 [ipv6]
>  [<f8900923>] ? fib6_clean_node+0x0/0x9f [ipv6]
>  [<f890d9e6>] ipv6_dev_mc_inc+0x2b9/0x2dc [ipv6]
>  [<f88f6745>] addrconf_join_solict+0x43/0x56 [ipv6]
>  [<f88f197d>] ipv6_dev_ac_inc+0x15c/0x1ab [ipv6]
>  [<f88f5f55>] addrconf_join_anycast+0x82/0x9b [ipv6]
>  [<f88f75b4>] __ipv6_ifa_notify+0xd6/0x153 [ipv6]
>  [<f88f8584>] ? addrconf_dad_timer+0x0/0x120 [ipv6]
>  [<f88f7662>] ipv6_ifa_notify+0x31/0x4c [ipv6]
>  [<f88f76a3>] addrconf_dad_completed+0x26/0xb7 [ipv6]
>  [<f88f8607>] addrconf_dad_timer+0x83/0x120 [ipv6]
>  [<f89fd942>] ? garp_join_timer+0x0/0x79 [garp]
>  [<f89fd9a5>] ? garp_join_timer+0x63/0x79 [garp]
>  [<c102dbff>] run_timer_softirq+0x152/0x1ca
>  [<c1029b9b>] __do_softirq+0x69/0xe6
>  [<c1029b32>] ? __do_softirq+0x0/0xe6
>  <IRQ>  [<c10298a2>] ? irq_exit+0x36/0x7b
>  [<c1012a71>] ? smp_apic_timer_interrupt+0x70/0x8c
>  [<c10032a1>] ? apic_timer_interrupt+0x31/0x38
>  [<c1008b67>] ? default_idle+0x36/0x5c
>  [<c1001cbb>] ? cpu_idle+0x72/0x9f
>  [<c1278d08>] ? rest_init+0x74/0x87
>  [<c13c9af9>] ? start_kernel+0x278/0x28e
>  [<c13c9312>] ? i386_start_kernel+0x40/0x56
> ADDRCONF(NETDEV_UP): eth2: link is not ready
> powernow-k8: Found 1 AMD Athlon(tm) 64 Processor 3000+ processors (1 cpu 
> cores) (version 2.20.00)
> powernow-k8:    0 : fid 0xa (1800 MHz), vid 0x6
> powernow-k8:    1 : fid 0x2 (1000 MHz), vid 0x12
> Marking TSC unstable due to cpufreq changes
> RTNL: assertion failed at net/core/dev.c (3961)
> Pid: 2744, comm: avahi-daemon Not tainted 2.6.31-rc4 #327
> Call Trace:
>  [<c127fd2b>] ? printk+0x1d/0x32
>  [<c120c43c>] dev_unicast_sync+0x3b/0xfe
>  [<f8a0b19d>] vlan_dev_set_rx_mode+0x2f/0x45 [8021q]
>  [<c120bab5>] __dev_set_rx_mode+0x88/0x9e
>  [<c1211c48>] dev_mc_add+0x52/0x7c
>  [<f890d5d1>] igmp6_group_added+0x5e/0x160 [ipv6]
>  [<c1202560>] ? sock_alloc_send_pskb+0x9c/0x267
>  [<f890d9e6>] ipv6_dev_mc_inc+0x2b9/0x2dc [ipv6]
>  [<f890eb15>] ipv6_sock_mc_join+0x15d/0x1ce [ipv6]
>  [<f8902565>] do_ipv6_setsockopt+0x8a7/0xc2e [ipv6]
>  [<c11ff715>] ? sock_recvmsg+0xdf/0x108
>  [<c11ff877>] ? sock_sendmsg+0xd8/0x100
>  [<c10384fe>] ? autoremove_wake_function+0x0/0x54
>  [<c108eb47>] ? file_update_time+0x9e/0xd0
>  [<c11ffba2>] ? sys_sendto+0x10d/0x146
>  [<f890293f>] ipv6_setsockopt+0x53/0xb0 [ipv6]
>  [<f8905951>] udpv6_setsockopt+0x4c/0x67 [ipv6]
>  [<c1201262>] sock_common_setsockopt+0x22/0x38
>  [<c11ff150>] sys_setsockopt+0x79/0xa8
>  [<c1200cd1>] sys_socketcall+0x129/0x18a
>  [<c1002bbb>] sysenter_do_call+0x12/0x26
> 
> 

Thanks for your detailed report Meelis

Seems because of following commit.

So assumption that dev_unicast_sync() is always called with RTNL is currently
false.


commit ccffad25b5136958d4769ed6de5e87992dd9c65c
Author: Jiri Pirko <jpirko@redhat.com>
Date:   Fri May 22 23:22:17 2009 +0000

    net: convert unicast addr list

    This patch converts unicast address list to standard list_head using
    previously introduced struct netdev_hw_addr. It also relaxes the
    locking. Original spinlock (still used for multicast addresses) is not
    needed and is no longer used for a protection of this list. All
    reading and writing takes place under rtnl (with no changes).

    I also removed a possibility to specify the length of the address
    while adding or deleting unicast address. It's always dev->addr_len.

    The convertion touched especially e1000 and ixgbe codes when the
    change is not so trivial.

    Signed-off-by: Jiri Pirko <jpirko@redhat.com>


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: RTNL: assertion failed at net/core/dev.c (3961)
  2009-07-30  9:08 ` Eric Dumazet
@ 2009-07-30 10:08   ` Jiri Pirko
  2009-07-30 11:06   ` [PATCH net-2.6] net: restore the original spinlock to protect unicast list Jiri Pirko
  1 sibling, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2009-07-30 10:08 UTC (permalink / raw)
  To: Eric Dumazet; +Cc: Meelis Roos, netdev

Thu, Jul 30, 2009 at 11:08:26AM CEST, eric.dumazet@gmail.com wrote:
>Meelis Roos a écrit :
>> I'm running 2.6.31-rc4 on an i386 pc and got these two similar 
>> but different in cause assertion failures  on boot. Seems to be 
>> repeatable. I saw similar messages on a kernel around -rc3 but it had 
>> SIT troubles so I did not test more earlier rc-s.
>> 
>> This seems to be VLAN+IPv6 related, so some more info on the 
>> configurartion:
>> 
>> eth0 is plain ethernet, internal LAN, IPv6 address autoconfigured from 
>> external 6to4 address.
>> 
>> eth1 is ethernet, external interface. Dynamic IPv4, 6to4 tunnel is 
>> created automatically from it. Only link-local IPv6 on this 
>> interface. This is untagged, but it also carries VLAN 4 tagged.
>> 
>> eth1.4 is the VLAN on eth1 that carries iptv. Dynamic IPv4, only 
>> link-local IPv6.
>> 
>> eth2 is plain internal LAN, like eth0 - static IPv4, IPv6 from 6to4.
>> 
>> tun6to4 is sti tunnel for 6to4, cofigured from eth1's IP.
>> 
>> eth0 and eth1 are 8139too, eth2 is uli526x.
>> 
>> RTNL: assertion failed at net/core/dev.c (3961)
>> Pid: 0, comm: swapper Not tainted 2.6.31-rc4 #327
>> Call Trace:
>>  [<c127fd2b>] ? printk+0x1d/0x32
>>  [<c120c43c>] dev_unicast_sync+0x3b/0xfe
>>  [<f8a0b19d>] vlan_dev_set_rx_mode+0x2f/0x45 [8021q]
>>  [<c120bab5>] __dev_set_rx_mode+0x88/0x9e
>>  [<c1211c48>] dev_mc_add+0x52/0x7c
>>  [<f890d5d1>] igmp6_group_added+0x5e/0x160 [ipv6]
>>  [<f8900923>] ? fib6_clean_node+0x0/0x9f [ipv6]
>>  [<f890d9e6>] ipv6_dev_mc_inc+0x2b9/0x2dc [ipv6]
>>  [<f88f6745>] addrconf_join_solict+0x43/0x56 [ipv6]
>>  [<f88f197d>] ipv6_dev_ac_inc+0x15c/0x1ab [ipv6]
>>  [<f88f5f55>] addrconf_join_anycast+0x82/0x9b [ipv6]
>>  [<f88f75b4>] __ipv6_ifa_notify+0xd6/0x153 [ipv6]
>>  [<f88f8584>] ? addrconf_dad_timer+0x0/0x120 [ipv6]
>>  [<f88f7662>] ipv6_ifa_notify+0x31/0x4c [ipv6]
>>  [<f88f76a3>] addrconf_dad_completed+0x26/0xb7 [ipv6]
>>  [<f88f8607>] addrconf_dad_timer+0x83/0x120 [ipv6]
>>  [<f89fd942>] ? garp_join_timer+0x0/0x79 [garp]
>>  [<f89fd9a5>] ? garp_join_timer+0x63/0x79 [garp]
>>  [<c102dbff>] run_timer_softirq+0x152/0x1ca
>>  [<c1029b9b>] __do_softirq+0x69/0xe6
>>  [<c1029b32>] ? __do_softirq+0x0/0xe6
>>  <IRQ>  [<c10298a2>] ? irq_exit+0x36/0x7b
>>  [<c1012a71>] ? smp_apic_timer_interrupt+0x70/0x8c
>>  [<c10032a1>] ? apic_timer_interrupt+0x31/0x38
>>  [<c1008b67>] ? default_idle+0x36/0x5c
>>  [<c1001cbb>] ? cpu_idle+0x72/0x9f
>>  [<c1278d08>] ? rest_init+0x74/0x87
>>  [<c13c9af9>] ? start_kernel+0x278/0x28e
>>  [<c13c9312>] ? i386_start_kernel+0x40/0x56
>> ADDRCONF(NETDEV_UP): eth2: link is not ready
>> powernow-k8: Found 1 AMD Athlon(tm) 64 Processor 3000+ processors (1 cpu 
>> cores) (version 2.20.00)
>> powernow-k8:    0 : fid 0xa (1800 MHz), vid 0x6
>> powernow-k8:    1 : fid 0x2 (1000 MHz), vid 0x12
>> Marking TSC unstable due to cpufreq changes
>> RTNL: assertion failed at net/core/dev.c (3961)
>> Pid: 2744, comm: avahi-daemon Not tainted 2.6.31-rc4 #327
>> Call Trace:
>>  [<c127fd2b>] ? printk+0x1d/0x32
>>  [<c120c43c>] dev_unicast_sync+0x3b/0xfe
>>  [<f8a0b19d>] vlan_dev_set_rx_mode+0x2f/0x45 [8021q]
>>  [<c120bab5>] __dev_set_rx_mode+0x88/0x9e
>>  [<c1211c48>] dev_mc_add+0x52/0x7c
>>  [<f890d5d1>] igmp6_group_added+0x5e/0x160 [ipv6]
>>  [<c1202560>] ? sock_alloc_send_pskb+0x9c/0x267
>>  [<f890d9e6>] ipv6_dev_mc_inc+0x2b9/0x2dc [ipv6]
>>  [<f890eb15>] ipv6_sock_mc_join+0x15d/0x1ce [ipv6]
>>  [<f8902565>] do_ipv6_setsockopt+0x8a7/0xc2e [ipv6]
>>  [<c11ff715>] ? sock_recvmsg+0xdf/0x108
>>  [<c11ff877>] ? sock_sendmsg+0xd8/0x100
>>  [<c10384fe>] ? autoremove_wake_function+0x0/0x54
>>  [<c108eb47>] ? file_update_time+0x9e/0xd0
>>  [<c11ffba2>] ? sys_sendto+0x10d/0x146
>>  [<f890293f>] ipv6_setsockopt+0x53/0xb0 [ipv6]
>>  [<f8905951>] udpv6_setsockopt+0x4c/0x67 [ipv6]
>>  [<c1201262>] sock_common_setsockopt+0x22/0x38
>>  [<c11ff150>] sys_setsockopt+0x79/0xa8
>>  [<c1200cd1>] sys_socketcall+0x129/0x18a
>>  [<c1002bbb>] sysenter_do_call+0x12/0x26
>> 
>> 
>
>Thanks for your detailed report Meelis
>
>Seems because of following commit.
>
>So assumption that dev_unicast_sync() is always called with RTNL is currently
>false.

Right, apparently I missed this path (called from dev_mcast.c which could not be
rtnl protected). I'll make a patch to add the original spin lock protection.

Jirka
>
>
>commit ccffad25b5136958d4769ed6de5e87992dd9c65c
>Author: Jiri Pirko <jpirko@redhat.com>
>Date:   Fri May 22 23:22:17 2009 +0000
>
>    net: convert unicast addr list
>
>    This patch converts unicast address list to standard list_head using
>    previously introduced struct netdev_hw_addr. It also relaxes the
>    locking. Original spinlock (still used for multicast addresses) is not
>    needed and is no longer used for a protection of this list. All
>    reading and writing takes place under rtnl (with no changes).
>
>    I also removed a possibility to specify the length of the address
>    while adding or deleting unicast address. It's always dev->addr_len.
>
>    The convertion touched especially e1000 and ixgbe codes when the
>    change is not so trivial.
>
>    Signed-off-by: Jiri Pirko <jpirko@redhat.com>
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH net-2.6] net: restore the original spinlock to protect unicast list
  2009-07-30  9:08 ` Eric Dumazet
  2009-07-30 10:08   ` Jiri Pirko
@ 2009-07-30 11:06   ` Jiri Pirko
  2009-07-30 12:38     ` Meelis Roos
  2009-08-02 19:29     ` David Miller
  1 sibling, 2 replies; 6+ messages in thread
From: Jiri Pirko @ 2009-07-30 11:06 UTC (permalink / raw)
  To: netdev; +Cc: Meelis Roos, Eric Dumazet, davem

There is a path when an assetion in dev_unicast_sync() appears. 

igmp6_group_added -> dev_mc_add -> __dev_set_rx_mode ->
-> vlan_dev_set_rx_mode -> dev_unicast_sync

Therefore we cannot protect this list with rtnl. This patch restores the
original protecting this list with spinlock.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>

diff --git a/net/core/dev.c b/net/core/dev.c
index 70c27e0..43e61ba 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3865,10 +3865,12 @@ int dev_unicast_delete(struct net_device *dev, void *addr)
 
 	ASSERT_RTNL();
 
+	netif_addr_lock_bh(dev);
 	err = __hw_addr_del(&dev->uc, addr, dev->addr_len,
 			    NETDEV_HW_ADDR_T_UNICAST);
 	if (!err)
 		__dev_set_rx_mode(dev);
+	netif_addr_unlock_bh(dev);
 	return err;
 }
 EXPORT_SYMBOL(dev_unicast_delete);
@@ -3889,10 +3891,12 @@ int dev_unicast_add(struct net_device *dev, void *addr)
 
 	ASSERT_RTNL();
 
+	netif_addr_lock_bh(dev);
 	err = __hw_addr_add(&dev->uc, addr, dev->addr_len,
 			    NETDEV_HW_ADDR_T_UNICAST);
 	if (!err)
 		__dev_set_rx_mode(dev);
+	netif_addr_unlock_bh(dev);
 	return err;
 }
 EXPORT_SYMBOL(dev_unicast_add);
@@ -3949,7 +3953,8 @@ void __dev_addr_unsync(struct dev_addr_list **to, int *to_count,
  *	@from: source device
  *
  *	Add newly added addresses to the destination device and release
- *	addresses that have no users left.
+ *	addresses that have no users left. The source device must be
+ *	locked by netif_tx_lock_bh.
  *
  *	This function is intended to be called from the dev->set_rx_mode
  *	function of layered software devices.
@@ -3958,14 +3963,14 @@ int dev_unicast_sync(struct net_device *to, struct net_device *from)
 {
 	int err = 0;
 
-	ASSERT_RTNL();
-
 	if (to->addr_len != from->addr_len)
 		return -EINVAL;
 
+	netif_addr_lock_bh(to);
 	err = __hw_addr_sync(&to->uc, &from->uc, to->addr_len);
 	if (!err)
 		__dev_set_rx_mode(to);
+	netif_addr_unlock_bh(to);
 	return err;
 }
 EXPORT_SYMBOL(dev_unicast_sync);
@@ -3981,28 +3986,30 @@ EXPORT_SYMBOL(dev_unicast_sync);
  */
 void dev_unicast_unsync(struct net_device *to, struct net_device *from)
 {
-	ASSERT_RTNL();
-
 	if (to->addr_len != from->addr_len)
 		return;
 
+	netif_addr_lock_bh(from);
+	netif_addr_lock(to);
 	__hw_addr_unsync(&to->uc, &from->uc, to->addr_len);
 	__dev_set_rx_mode(to);
+	netif_addr_unlock(to);
+	netif_addr_unlock_bh(from);
 }
 EXPORT_SYMBOL(dev_unicast_unsync);
 
 static void dev_unicast_flush(struct net_device *dev)
 {
-	/* rtnl_mutex must be held here */
-
+	netif_addr_lock_bh(dev);
 	__hw_addr_flush(&dev->uc);
+	netif_addr_unlock_bh(dev);
 }
 
 static void dev_unicast_init(struct net_device *dev)
 {
-	/* rtnl_mutex must be held here */
-
+	netif_addr_lock_bh(dev);
 	__hw_addr_init(&dev->uc);
+	netif_addr_unlock_bh(dev);
 }
 
 

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH net-2.6] net: restore the original spinlock to protect unicast list
  2009-07-30 11:06   ` [PATCH net-2.6] net: restore the original spinlock to protect unicast list Jiri Pirko
@ 2009-07-30 12:38     ` Meelis Roos
  2009-08-02 19:29     ` David Miller
  1 sibling, 0 replies; 6+ messages in thread
From: Meelis Roos @ 2009-07-30 12:38 UTC (permalink / raw)
  To: Jiri Pirko; +Cc: netdev, Eric Dumazet, davem

> There is a path when an assetion in dev_unicast_sync() appears. 
> 
> igmp6_group_added -> dev_mc_add -> __dev_set_rx_mode ->
> -> vlan_dev_set_rx_mode -> dev_unicast_sync
> 
> Therefore we cannot protect this list with rtnl. This patch restores the
> original protecting this list with spinlock.

Thank you, it works for me!

Tested-by: Meelis Roos <mroos@linux.ee>

-- 
Meelis Roos (mroos@linux.ee)

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH net-2.6] net: restore the original spinlock to protect unicast list
  2009-07-30 11:06   ` [PATCH net-2.6] net: restore the original spinlock to protect unicast list Jiri Pirko
  2009-07-30 12:38     ` Meelis Roos
@ 2009-08-02 19:29     ` David Miller
  1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2009-08-02 19:29 UTC (permalink / raw)
  To: jpirko; +Cc: netdev, mroos, eric.dumazet

From: Jiri Pirko <jpirko@redhat.com>
Date: Thu, 30 Jul 2009 13:06:12 +0200

> There is a path when an assetion in dev_unicast_sync() appears. 
> 
> igmp6_group_added -> dev_mc_add -> __dev_set_rx_mode ->
> -> vlan_dev_set_rx_mode -> dev_unicast_sync
> 
> Therefore we cannot protect this list with rtnl. This patch restores the
> original protecting this list with spinlock.
> 
> Signed-off-by: Jiri Pirko <jpirko@redhat.com>

Applied, thanks.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2009-08-02 19:29 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-30  8:23 RTNL: assertion failed at net/core/dev.c (3961) Meelis Roos
2009-07-30  9:08 ` Eric Dumazet
2009-07-30 10:08   ` Jiri Pirko
2009-07-30 11:06   ` [PATCH net-2.6] net: restore the original spinlock to protect unicast list Jiri Pirko
2009-07-30 12:38     ` Meelis Roos
2009-08-02 19:29     ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).