b57bd06655
fix deadlock in the 8139too driver: poll handlers should never forcibly enable local interrupts, because they might be used by netpoll/printk from IRQ context. ================================= [ INFO: inconsistent lock state ] 2.6.19 #11 --------------------------------- inconsistent {softirq-on-W} -> {in-softirq-W} usage. swapper/1 [HC0[0]:SC1[1]:HE1:SE0] takes: (&npinfo->poll_lock){-+..}, at: [<c0350a41>] net_rx_action+0x64/0x1de {softirq-on-W} state was registered at: [<c0134c86>] mark_lock+0x5b/0x39c [<c0135012>] mark_held_locks+0x4b/0x68 [<c01351e9>] trace_hardirqs_on+0x115/0x139 [<c02879e6>] rtl8139_poll+0x3d7/0x3f4 [<c035c85d>] netpoll_poll+0x82/0x32f [<c035c775>] netpoll_send_skb+0xc9/0x12f [<c035cdcc>] netpoll_send_udp+0x253/0x25b [<c0288463>] write_msg+0x40/0x65 [<c011cead>] __call_console_drivers+0x45/0x51 [<c011cf16>] _call_console_drivers+0x5d/0x61 [<c011d4fb>] release_console_sem+0x11f/0x1d8 [<c011d7d7>] register_console+0x1ac/0x1b3 [<c02883f8>] init_netconsole+0x55/0x67 [<c010040c>] init+0x9a/0x24e [<c01049cf>] kernel_thread_helper+0x7/0x10 [<ffffffff>] 0xffffffff irq event stamp: 819992 hardirqs last enabled at (819992): [<c0350a16>] net_rx_action+0x39/0x1de hardirqs last disabled at (819991): [<c0350b1e>] net_rx_action+0x141/0x1de softirqs last enabled at (817552): [<c01214e4>] __do_softirq+0xa3/0xa8 softirqs last disabled at (819987): [<c0106051>] do_softirq+0x5b/0xc9 other info that might help us debug this: no locks held by swapper/1. stack backtrace: [<c0104d88>] dump_trace+0x63/0x1e8 [<c0104f26>] show_trace_log_lvl+0x19/0x2e [<c010532d>] show_trace+0x12/0x14 [<c0105343>] dump_stack+0x14/0x16 [<c0134980>] print_usage_bug+0x23c/0x246 [<c0134d33>] mark_lock+0x108/0x39c [<c01356a7>] __lock_acquire+0x361/0x9ed [<c0136018>] lock_acquire+0x56/0x72 [<c03aff1f>] _spin_lock+0x35/0x42 [<c0350a41>] net_rx_action+0x64/0x1de [<c0121493>] __do_softirq+0x52/0xa8 [<c0106051>] do_softirq+0x5b/0xc9 [<c0121338>] irq_exit+0x3c/0x48 [<c0106163>] do_IRQ+0xa4/0xbd [<c01047c6>] common_interrupt+0x2e/0x34 [<c011db92>] vprintk+0x2c0/0x309 [<c011dbf6>] printk+0x1b/0x1d [<c01003f2>] init+0x80/0x24e [<c01049cf>] kernel_thread_helper+0x7/0x10 ======================= Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> |
||
---|---|---|
.. | ||
appletalk | ||
arcnet | ||
arm | ||
bonding | ||
chelsio | ||
cris | ||
e1000 | ||
ehea | ||
fec_8xx | ||
fs_enet | ||
hamradio | ||
ibm_emac | ||
irda | ||
ixgb | ||
ixp2000 | ||
myri10ge | ||
netxen | ||
pcmcia | ||
phy | ||
sk98lin | ||
skfp | ||
tokenring | ||
tulip | ||
wan | ||
wireless | ||
3c59x.c | ||
3c501.c | ||
3c501.h | ||
3c503.c | ||
3c503.h | ||
3c505.c | ||
3c505.h | ||
3c507.c | ||
3c509.c | ||
3c515.c | ||
3c523.c | ||
3c523.h | ||
3c527.c | ||
3c527.h | ||
7990.c | ||
7990.h | ||
8139cp.c | ||
8139too.c | ||
8390.c | ||
8390.h | ||
82596.c | ||
a2065.c | ||
a2065.h | ||
ac3200.c | ||
acenic_firmware.h | ||
acenic.c | ||
acenic.h | ||
amd8111e.c | ||
amd8111e.h | ||
apne.c | ||
ariadne.c | ||
ariadne.h | ||
at1700.c | ||
atari_bionet.c | ||
atari_pamsnet.c | ||
atarilance.c | ||
atp.c | ||
atp.h | ||
au1000_eth.c | ||
au1000_eth.h | ||
b44.c | ||
b44.h | ||
bmac.c | ||
bmac.h | ||
bnx2_fw2.h | ||
bnx2_fw.h | ||
bnx2.c | ||
bnx2.h | ||
bsd_comp.c | ||
cassini.c | ||
cassini.h | ||
cs89x0.c | ||
cs89x0.h | ||
de600.c | ||
de600.h | ||
de620.c | ||
de620.h | ||
declance.c | ||
defxx.c | ||
defxx.h | ||
depca.c | ||
depca.h | ||
dgrs_asstruct.h | ||
dgrs_bcomm.h | ||
dgrs_es4h.h | ||
dgrs_ether.h | ||
dgrs_firmware.c | ||
dgrs_i82596.h | ||
dgrs_plx9060.h | ||
dgrs.c | ||
dgrs.h | ||
dl2k.c | ||
dl2k.h | ||
dm9000.c | ||
dm9000.h | ||
dummy.c | ||
e100.c | ||
e2100.c | ||
eepro100.c | ||
eepro.c | ||
eexpress.c | ||
eexpress.h | ||
epic100.c | ||
eql.c | ||
es3210.c | ||
eth16i.c | ||
ewrk3.c | ||
ewrk3.h | ||
fealnx.c | ||
fec.c | ||
fec.h | ||
forcedeth.c | ||
gianfar_ethtool.c | ||
gianfar_mii.c | ||
gianfar_mii.h | ||
gianfar_sysfs.c | ||
gianfar.c | ||
gianfar.h | ||
hamachi.c | ||
hp100.c | ||
hp100.h | ||
hp-plus.c | ||
hp.c | ||
hplance.c | ||
hplance.h | ||
hydra.c | ||
ibmlana.c | ||
ibmlana.h | ||
ibmveth.c | ||
ibmveth.h | ||
ifb.c | ||
ioc3-eth.c | ||
isa-skeleton.c | ||
iseries_veth.c | ||
jazzsonic.c | ||
Kconfig | ||
lance.c | ||
lasi_82596.c | ||
lib8390.c | ||
LICENSE.SRC | ||
lne390.c | ||
loopback.c | ||
lp486e.c | ||
mac89x0.c | ||
mac8390.c | ||
macb.c | ||
macb.h | ||
mace.c | ||
mace.h | ||
macmace.c | ||
macsonic.c | ||
Makefile | ||
meth.c | ||
meth.h | ||
mii.c | ||
mipsnet.c | ||
mipsnet.h | ||
mv643xx_eth.c | ||
mv643xx_eth.h | ||
mvme147.c | ||
myri_code.h | ||
myri_sbus.c | ||
myri_sbus.h | ||
natsemi.c | ||
ne2.c | ||
ne2k-pci.c | ||
ne3210.c | ||
ne-h8300.c | ||
ne.c | ||
netconsole.c | ||
netx-eth.c | ||
ni52.c | ||
ni52.h | ||
ni65.c | ||
ni65.h | ||
ni5010.c | ||
ni5010.h | ||
ns83820.c | ||
oaknet.c | ||
pci-skeleton.c | ||
pcnet32.c | ||
plip.c | ||
ppp_async.c | ||
ppp_deflate.c | ||
ppp_generic.c | ||
ppp_mppe.c | ||
ppp_mppe.h | ||
ppp_synctty.c | ||
pppoe.c | ||
pppox.c | ||
qla3xxx.c | ||
qla3xxx.h | ||
r8169.c | ||
rionet.c | ||
rrunner.c | ||
rrunner.h | ||
s2io-regs.h | ||
s2io.c | ||
s2io.h | ||
saa9730.c | ||
saa9730.h | ||
sb1000.c | ||
sb1250-mac.c | ||
seeq8005.c | ||
seeq8005.h | ||
sgiseeq.c | ||
sgiseeq.h | ||
shaper.c | ||
sis190.c | ||
sis900.c | ||
sis900.h | ||
sk_mca.c | ||
sk_mca.h | ||
skge.c | ||
skge.h | ||
sky2.c | ||
sky2.h | ||
slhc.c | ||
slip.c | ||
slip.h | ||
smc91x.c | ||
smc91x.h | ||
smc911x.c | ||
smc911x.h | ||
smc9194.c | ||
smc9194.h | ||
smc-mca.c | ||
smc-ultra32.c | ||
smc-ultra.c | ||
sonic.c | ||
sonic.h | ||
Space.c | ||
spider_net_ethtool.c | ||
spider_net.c | ||
spider_net.h | ||
starfire_firmware.h | ||
starfire_firmware.pl | ||
starfire.c | ||
stnic.c | ||
sun3_82586.c | ||
sun3_82586.h | ||
sun3lance.c | ||
sunbmac.c | ||
sunbmac.h | ||
sundance.c | ||
sungem_phy.c | ||
sungem_phy.h | ||
sungem.c | ||
sungem.h | ||
sunhme.c | ||
sunhme.h | ||
sunlance.c | ||
sunqe.c | ||
sunqe.h | ||
tc35815.c | ||
tg3.c | ||
tg3.h | ||
tlan.c | ||
tlan.h | ||
tsi108_eth.c | ||
tsi108_eth.h | ||
tun.c | ||
typhoon-firmware.h | ||
typhoon.c | ||
typhoon.h | ||
ucc_geth_phy.c | ||
ucc_geth_phy.h | ||
ucc_geth.c | ||
ucc_geth.h | ||
via-rhine.c | ||
via-velocity.c | ||
via-velocity.h | ||
wd.c | ||
yellowfin.c | ||
znet.c | ||
zorro8390.c |