netpoll: fix netpoll lockups
Subsystems (2)
PATCH 1/1 netpoll: fix netpoll lockups
Subject: [patch] netpoll: fix netpoll lockups
From: Ingo Molnar <[email protected]>
current -git doesnt boot on my laptop due to the following netpoll breakages:
- unlock the tx lock in the else branch too ...
- use irq-safe locking instead of bh-safe locking, netpoll is often called from irq context.
with this patch -git boots fine with lockdep enabled and there are no locking complaints and everything works fine. (The netpoll_send_skb() portion of this patch was based on Andrew's bh-locking based netpoll patch in -mm.)
--- net/core/netpoll.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-)
net/core/netpoll.c +24 -15
@@ -55,6 +55,7 @@ static void queue_process(struct work_ststruct netpoll_info *npinfo = container_of(work, struct netpoll_info, tx_work.work);struct sk_buff *skb; +unsigned long flags;while ((skb =skb_dequeue (&npinfo->txq))) {struct net_device *dev = skb->dev;
@@ -64,15 +65,19 @@ static void queue_process(struct work_stcontinue ; } -netif_tx_lock_bh (dev); +local_irq_save (flags); +netif_tx_lock (dev);if (netif_queue_stopped (dev) || dev->hard_start_xmit (skb, dev) !=NETDEV_TX_OK ) {skb_queue_head (&npinfo->txq, skb); -netif_tx_unlock_bh (dev); +netif_tx_unlock (dev); +local_irq_restore (flags);schedule_delayed_work (&npinfo->tx_work,HZ /10 );return ; } +netif_tx_unlock (dev); +local_irq_restore (flags); } }
@@ -231,7 +236,7 @@ repeat:static void netpoll_send_skb (struct netpoll *np,struct sk_buff *skb) {int status =NETDEV_TX_BUSY ; -unsigned long tries; +unsigned long tries, flags;struct net_device *dev = np->dev;struct netpoll_info *npinfo = np->dev->npinfo;
@@ -242,22 +247,26 @@ static void netpoll_send_skb(struct netp/* don't get messages out of order, and no recursion */ if (skb_queue_len (&npinfo->txq) ==0 && - npinfo->poll_owner !=smp_processor_id () && -netif_tx_trylock (dev)) { -/* try until next clock tick */ -for (tries =jiffies_to_usecs (1 )/USEC_PER_POLL ; tries >0 ; --tries) { -if (!netif_queue_stopped (dev)) - status = dev->hard_start_xmit (skb, dev); + npinfo->poll_owner !=smp_processor_id ()) { +local_irq_save (flags);/* Where's netif_tx_trylock_irqsave()? */ +if (netif_tx_trylock (dev)) { +/* try until next clock tick */ +for (tries =jiffies_to_usecs (1 )/USEC_PER_POLL ; + tries >0 ; --tries) { +if (!netif_queue_stopped (dev)) + status = dev->hard_start_xmit (skb, dev); -if (status ==NETDEV_TX_OK ) -break ; +if (status ==NETDEV_TX_OK ) +break ; -/* tickle device maybe there is some cleanup */ -netpoll_poll (np); +/* tickle device maybe there is some cleanup */ +netpoll_poll (np); -udelay (USEC_PER_POLL ); +udelay (USEC_PER_POLL ); + } +netif_tx_unlock (dev); } -netif_tx_unlock (dev); +local_irq_restore (flags); }if (status !=NETDEV_TX_OK ) {
PATCH 1/1 net, 8139too.c: fix netpoll deadlock
Subject: [patch] net, 8139too.c: fix netpoll deadlock
From: Ingo Molnar <[email protected]>
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 =======================
--- drivers/net/8139too.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/8139too.c +3 -2
@@ -2131,14 +2131,15 @@ static int rtl8139_poll(struct net_devic }if (done) { +unsigned long flags;/* * Order is important since data can get interrupted * again when we think we are done. */ -local_irq_disable (); +local_irq_save (flags);RTL_W16_F (IntrMask, rtl8139_intr_mask);__netif_rx_complete (dev); -local_irq_enable (); +local_irq_restore (flags); }spin_unlock (&tp->rx_lock);
Re: [patch] net, 8139too.c: fix netpoll deadlock
Quoted 4 lines · Ingo Molnar
Subject: [patch] net,
8139too.c: fix netpoll deadlock
From: Ingo Molnar <[email protected]>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.
ACK
(I'll queue it, if Linus doesn't pick it up; please CC me in the future)
Re: [patch] net, 8139too.c: fix netpoll deadlock
Jeff Garzik <[email protected]> :
Quoted 1 line
Ingo Molnar wrote:
[...]
Quoted 7 lines
Quoted 3 lines
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.
ACK
(I'll queue it, if Linus doesn't pick it up; please CC me in the future)
I have lived with the "NAPI ->poll() handler runs in BH irq enabled context" rule for years. Is it definitely false/dead ?
If so at least 8139cp needs the same fix.
Signature · 1 line
Ueimor
Re: [patch] net, 8139too.c: fix netpoll deadlock
Quoted 7 lines · Francois Romieu
Quoted 2 lines
(I'll queue it, if Linus doesn't pick it up; please CC me in the future)
I have lived with the "NAPI ->poll() handler runs in BH irq enabled context" rule for years. Is it definitely false/dead ?
If so at least 8139cp needs the same fix.
hm, this isnt really about NAPI polling, but about the netconsole/netpoll/netdump poll_controller() handler.
with netconsole, printk can be called from IRQ context (and is frequently from IRQ context during bootup or module initialization), so a BH rule isnt enough for them.
Ingo
Re: [patch] net, 8139too.c: fix netpoll deadlock
Let me resume two months old topic...
Quoted 11 lines · Ingo Molnar
Quoted 4 lines
I have lived with the "NAPI ->poll() handler runs in BH irq enabled context" rule for years. Is it definitely false/dead ?
If so at least 8139cp needs the same fix.
hm, this isnt really about NAPI polling, but about the netconsole/netpoll/netdump
poll_controller()handler.with netconsole, printk can be called from IRQ context (and is frequently from IRQ context during bootup or module initialization), so a BH rule isnt enough for them.
I see NAPI poll routine might be called with interrupt disabled.
Many (all?) NAPI drivers call netif_receive_skb() from its poll routine (as described in NAPI-HOWTO.txt), but I thought netif_receive_skb() cannot be called from irq context or irq disabled. So it seems the problem is not solved completely. Or am I missing something?
---
Atsushi Nemoto
Re: [patch] net, 8139too.c: fix netpoll deadlock
Quoted 7 lines · Atsushi Nemoto
Quoted 6 lines
hm, this isnt really about NAPI polling, but about the netconsole/netpoll/netdump
poll_controller()handler.with netconsole, printk can be called from IRQ context (and is frequently from IRQ context during bootup or module initialization), so a BH rule isnt enough for them.
Quoted 7 lines
I see NAPI poll routine might be called with interrupt disabled.
Many (all?) NAPI drivers call
netif_receive_skb()from its poll routine (as described in NAPI-HOWTO.txt), but I thoughtnetif_receive_skb()cannot be called from irq context or irq disabled. So it seems the problem is not solved completely. Or am I missing something?
Any comments for this issue? If my understanding was correct, I think add some checking to netif_receive_skb() is better then fixing all poll routines. Is this patch acceptable?
Subject: fix irq problem with NAPI + NETPOLL
It seems netif_receive_skb() was designed not to call from irq context, but NAPI + NETPOLL break this rule. If netif_receive_skb() was called from irq context, redirect to netif_rx() instead of processing the skb in that context.
---
net/core/dev.c +9 -2
@@ -1769,8 +1769,15 @@ int netif_receive_skb(struct sk_buff *sk__be16 type;/* if we've gotten here through NAPI, check netpoll */ -if (skb->dev->poll &&netpoll_rx (skb)) -return NET_RX_DROP ; +#ifdef CONFIG_NET_POLL_CONTROLLER +if (skb->dev->poll && skb->dev->poll_controller) { +/* NAPI poll might be called in irq context on NETPOLL */ +if (in_irq () ||irqs_disabled ()) +return netif_rx (skb); +if (netpoll_rx (skb)) +return NET_RX_DROP ; + } +#endif if (!skb->tstamp.off_sec)net_timestamp (skb);
Quoted 7 lines · Ingo Molnar
current -git doesnt boot on my laptop due to the following netpoll breakages:
- unlock the tx lock in the else branch too ...
- use irq-safe locking instead of bh-safe locking, netpoll is often called from irq context.
This one doesn't apply for me any more, probably because David checked in the patch from Andrew that fixed at least _part_ of the problem.
Davem, Ingo, Herbert, can you verify whether the fixes in the current -git tree replace this patch from Ingo, or whether Ingo's patch is still needed and just needs to be refreshed.
Linus
PATCH 1/1 netpoll: fix netpoll lockup
Quoted 9 lines · Linus Torvalds
Quoted 7 lines · Ingo Molnar
current -git doesnt boot on my laptop due to the following netpoll breakages:
- unlock the tx lock in the else branch too ...
- use irq-safe locking instead of bh-safe locking, netpoll is often called from irq context.
Quoted 6 lines
This one doesn't apply for me any more, probably because David checked in the patch from Andrew that fixed at least _part_ of the problem.
Davem, Ingo, Herbert, can you verify whether the fixes in the current -git tree replace this patch from Ingo, or whether Ingo's patch is still needed and just needs to be refreshed.
the first half of it is still needed - find the delta patch ontop of current -git below.
Ingo
------------------------>
Subject: [patch] netpoll: fix netpoll lockup
From: Ingo Molnar <[email protected]>
current -git doesnt boot on my laptop due to netpoll not unlocking the tx lock in the else branch.
booted this up on my laptop with lockdep enabled and there are no locking complaints and it works fine.
--- net/core/netpoll.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/core/netpoll.c +7 -2
@@ -55,6 +55,7 @@ static void queue_process(struct work_ststruct netpoll_info *npinfo = container_of(work, struct netpoll_info, tx_work.work);struct sk_buff *skb; +unsigned long flags;while ((skb =skb_dequeue (&npinfo->txq))) {struct net_device *dev = skb->dev;
@@ -64,15 +65,19 @@ static void queue_process(struct work_stcontinue ; } -netif_tx_lock_bh (dev); +local_irq_save (flags); +netif_tx_lock (dev);if (netif_queue_stopped (dev) || dev->hard_start_xmit (skb, dev) !=NETDEV_TX_OK ) {skb_queue_head (&npinfo->txq, skb); -netif_tx_unlock_bh (dev); +netif_tx_unlock (dev); +local_irq_restore (flags);schedule_delayed_work (&npinfo->tx_work,HZ /10 );return ; } +netif_tx_unlock (dev); +local_irq_restore (flags); } }
Re: [patch] netpoll: fix netpoll lockup
Quoted 3 lines · Ingo Molnar
the first half of it is still needed - find the delta patch ontop of current -git below.
The unlock in the else branch is definitely needed. However, since queue_process is always run from process context we don't need the IRQ disabling.
Cheers,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt