linux.git/drivers/net/meth.c, branch v2.6.31

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-05-19T04:08:20+00:00

Conflicts:
	drivers/scsi/fcoe/fcoe.c

NET: Meth: Fix unsafe mix of irq and non-irq spinlocks.

2009-05-18T04:11:36+00:00

Mixing of normal and irq spinlocks results in the following lockdep messages
on bootup on IP32:

[...]
Sending DHCP requests .
======================================================
[ INFO: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected ]
2.6.30-rc5-00164-g41baeef #30
------------------------------------------------------
swapper/1 [HC0[0]:SC0[1]:HE0:SE0] is trying to acquire:
 (&priv->meth_lock){+.+...}, at: [] meth_tx+0x48/0x43c

and this task is already holding:
 (_xmit_ETHER#2){+.-...}, at: [] __qdisc_run+0x118/0x30c
which would create a new lock dependency:
 (_xmit_ETHER#2){+.-...} -> (&priv->meth_lock){+.+...}

but this new dependency connects a SOFTIRQ-irq-safe lock:
 (_xmit_ETHER#2){+.-...}
... which became SOFTIRQ-irq-safe at:
  [] __lock_acquire+0x784/0x1a14
  [] lock_acquire+0xf8/0x150
  [] _spin_lock+0x30/0x44
  [] dev_watchdog+0x70/0x398
  [] run_timer_softirq+0x1a8/0x248
  [] __do_softirq+0xec/0x208
  [] do_softirq+0x60/0xe4
  [] irq_exit+0x54/0x9c
  [] ret_from_irq+0x0/0x4
  [] r4k_wait+0x20/0x40
  [] cpu_idle+0x30/0x60
  [] start_kernel+0x3ec/0x404

to a SOFTIRQ-irq-unsafe lock:
 (&priv->meth_lock){+.+...}
... which became SOFTIRQ-irq-unsafe at:
...  [] __lock_acquire+0x824/0x1a14
  [] lock_acquire+0xf8/0x150
  [] _spin_lock+0x30/0x44
  [] meth_reset+0x118/0x2d8
  [] meth_open+0x28/0x140
  [] dev_open+0xe0/0x18c
  [] dev_change_flags+0xd8/0x1d4
  [] ip_auto_config+0x1d4/0xf28
  [] do_one_initcall+0x58/0x170
  [] kernel_init+0x98/0x104
  [] kernel_thread_helper+0x10/0x18

other info that might help us debug this:

2 locks held by swapper/1:
 #0:  (rcu_read_lock){.+.+..}, at: [] dev_queue_xmit+0x1e0/0x4b0
 #1:  (_xmit_ETHER#2){+.-...}, at: [] __qdisc_run+0x118/0x30c

the SOFTIRQ-irq-safe lock's dependencies:
-> (_xmit_ETHER#2){+.-...} ops: 0 {
   HARDIRQ-ON-W at:
                        [] __lock_acquire+0x7fc/0x1a14
                        [] lock_acquire+0xf8/0x150
                        [] _spin_lock+0x30/0x44
                        [] dev_watchdog+0x70/0x398
                        [] run_timer_softirq+0x1a8/0x248
                        [] __do_softirq+0xec/0x208
                        [] do_softirq+0x60/0xe4
                        [] irq_exit+0x54/0x9c
                        [] ret_from_irq+0x0/0x4
                        [] r4k_wait+0x20/0x40
                        [] cpu_idle+0x30/0x60
                        [] start_kernel+0x3ec/0x404
   IN-SOFTIRQ-W at:
                        [] __lock_acquire+0x784/0x1a14
                        [] lock_acquire+0xf8/0x150
                        [] _spin_lock+0x30/0x44
                        [] dev_watchdog+0x70/0x398
                        [] run_timer_softirq+0x1a8/0x248
                        [] __do_softirq+0xec/0x208
                        [] do_softirq+0x60/0xe4
                        [] irq_exit+0x54/0x9c
                        [] ret_from_irq+0x0/0x4
                        [] r4k_wait+0x20/0x40
                        [] cpu_idle+0x30/0x60
                        [] start_kernel+0x3ec/0x404
   INITIAL USE at:
                       [] __lock_acquire+0x89c/0x1a14
                       [] lock_acquire+0xf8/0x150
                       [] _spin_lock+0x30/0x44
                       [] dev_watchdog+0x70/0x398
                       [] run_timer_softirq+0x1a8/0x248
                       [] __do_softirq+0xec/0x208
                       [] do_softirq+0x60/0xe4
                       [] irq_exit+0x54/0x9c
                       [] ret_from_irq+0x0/0x4
                       [] r4k_wait+0x20/0x40
                       [] cpu_idle+0x30/0x60
                       [] start_kernel+0x3ec/0x404
 }
 ... key      at: [] netdev_xmit_lock_key+0x8/0x1c8

the SOFTIRQ-irq-unsafe lock's dependencies:
-> (&priv->meth_lock){+.+...} ops: 0 {
   HARDIRQ-ON-W at:
                        [] __lock_acquire+0x7fc/0x1a14
                        [] lock_acquire+0xf8/0x150
                        [] _spin_lock+0x30/0x44
                        [] meth_reset+0x118/0x2d8
                        [] meth_open+0x28/0x140
                        [] dev_open+0xe0/0x18c
                        [] dev_change_flags+0xd8/0x1d4
                        [] ip_auto_config+0x1d4/0xf28
                        [] do_one_initcall+0x58/0x170
                        [] kernel_init+0x98/0x104
                        [] kernel_thread_helper+0x10/0x18
   SOFTIRQ-ON-W at:
                        [] __lock_acquire+0x824/0x1a14
                        [] lock_acquire+0xf8/0x150
                        [] _spin_lock+0x30/0x44
                        [] meth_reset+0x118/0x2d8
                        [] meth_open+0x28/0x140
                        [] dev_open+0xe0/0x18c
                        [] dev_change_flags+0xd8/0x1d4
                        [] ip_auto_config+0x1d4/0xf28
                        [] do_one_initcall+0x58/0x170
                        [] kernel_init+0x98/0x104
                        [] kernel_thread_helper+0x10/0x18
   INITIAL USE at:
                       [] __lock_acquire+0x89c/0x1a14
                       [] lock_acquire+0xf8/0x150
                       [] _spin_lock+0x30/0x44
                       [] meth_reset+0x118/0x2d8
                       [] meth_open+0x28/0x140
                       [] dev_open+0xe0/0x18c
                       [] dev_change_flags+0xd8/0x1d4
                       [] ip_auto_config+0x1d4/0xf28
                       [] do_one_initcall+0x58/0x170
                       [] kernel_init+0x98/0x104
                       [] kernel_thread_helper+0x10/0x18
 }
 ... key      at: [] __key.32424+0x0/0x8

stack backtrace:
Call Trace:
[] dump_stack+0x8/0x34
[] check_usage+0x470/0x4a0
[] check_irq_usage+0x90/0x130
[] __lock_acquire+0x12a4/0x1a14
[] lock_acquire+0xf8/0x150
[] _spin_lock_irqsave+0x60/0x84
[] meth_tx+0x48/0x43c
[] __qdisc_run+0x150/0x30c
[] dev_queue_xmit+0x334/0x4b0
[] ip_auto_config+0x8d0/0xf28
[] do_one_initcall+0x58/0x170
[] kernel_init+0x98/0x104
[] kernel_thread_helper+0x10/0x18

..... timed out!
IP-Config: Retrying forever (NFS root)...
Sending DHCP requests ., OK
[...]

Fixed by converting all locks to irq locks.

Signed-off-by: Ralf Baechle 
Tested-by: Andrew Randrianasulu 
Signed-off-by: David S. Miller

meth: convert to net_device_ops

2009-04-16T09:20:17+00:00

Signed-off-by: Alexander Beregalov 
Signed-off-by: David S. Miller

MIPS: Stop using .

2009-03-30T12:49:41+00:00

This fixes a few warnings - and triggers a few new ones which the rest of
this patch fixes.

Signed-off-by: Ralf Baechle

drivers/net: Kill now superfluous ->last_rx stores.

2008-11-04T05:11:17+00:00

The generic packet receive code takes care of setting
netdev->last_rx when necessary, for the sake of the
bonding ARP monitor.

Drivers need not do it any more.

Some cases had to be skipped over because the drivers
were making use of the ->last_rx value themselves.

Signed-off-by: David S. Miller

net: convert print_mac to %pM

2008-10-28T00:06:18+00:00

This converts pretty much everything to print_mac. There were
a few things that had conflicts which I have just dropped for
now, no harm done.

I've built an allyesconfig with this and looked at the files
that weren't built very carefully, but it's a huge patch.

Signed-off-by: Johannes Berg 
Signed-off-by: David S. Miller

drivers/net: replace FUNCTION with func

2008-09-24T22:59:00+00:00

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison 
Signed-off-by: Andrew Morton 
Signed-off-by: Jeff Garzik

METH: fix MAC address setup

2008-08-07T06:11:19+00:00

Setup of the mac filter lost the upper 16bit of the mac address. This
bug got unconvered by a patch, which fixed the promiscous handling.

Signed-off-by: Thomas Bogendoerfer 
Signed-off-by: Jeff Garzik

Fix typo in meth driver

2008-07-22T23:34:21+00:00

An | in an if statement to check a bit? I think this needs to be a &.
As a result of this typo meth will always operate in promiscuous mode.

Signed-off-by: Christoph Lameter 
Signed-off-by: Jeff Garzik

net drivers: fix platform driver hotplug/coldplug

2008-04-25T06:08:54+00:00

Since 43cc71eed1250755986da4c0f9898f9a635cb3bf, the platform modalias is
prefixed with "platform:".  Add MODULE_ALIAS() to the hotpluggable network
platform drivers, to re-enable auto loading.

NOTE: didn't change drivers/net/fs_enet/fs_enet-main.c "old binding" support.
That looks problematic in the first place (it even uses the ancient "struct
device_driver" binding scheme for platform_bus!) and I suspect it will vanish
soonish when arch/powerpc rules the world.  Also, drivers/net/ne.c would have
needed more thought to sort out.

[akpm@linux-foundation.org: fix sgiseeq.c]
[dbrownell@users.sourceforge.net: more drivers, registration fixes]
Signed-off-by: Kay Sievers 
Signed-off-by: David Brownell 
Cc: Scott Wood 
Cc: Vitaly Bordug 
Cc: Dale Farnsworth 
Cc: Ben Dooks 
Cc: Ralf Baechle 
Cc: Andrew Victor 
Cc: Bryan Wu 
Signed-off-by: Andrew Morton 
Signed-off-by: Jeff Garzik