Commit f47aeffd authored Sep 30, 2008 by Jarek Poplawski Committed by David S. Miller Oct 08, 2008

lib8390: Fix locking in ei_poll (poll controller)



This lockdep warning:
  =================================
  [ INFO: inconsistent lock state ]
  2.6.27-rc7 #3
  ---------------------------------
  inconsistent {in-softirq-W} -> {softirq-on-W} usage.
  syslogd/2474 [HC0[0]:SC0[0]:HE1:SE1] takes:
   (_xmit_ETHER#2){-+..}, at: [<c0265562>] netpoll_send_skb+0x132/0x190
  ...

is caused by unconditional local_irq_disable()/local_irq_enable() in
disable_irq_lockdep()/enable_irq_lockdep() used by __ei_poll(). Since
netconsole/netpoll always calls dev->poll_controller() with local irqs
disabled, disable_irq()/enable_irq() instead is safe and enough (like
e.g. in 3c509 or 8139xx drivers).

Reported-and-tested-by: Bernard Pidoux F6BVP <f6bvp@free.fr>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 23e55a32

drivers/net/lib8390.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -530,9 +530,9 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id)
		#ifdef CONFIG_NET_POLL_CONTROLLER
		static void __ei_poll(struct net_device *dev)
		{
		disable_irq_lockdep(dev->irq);
		disable_irq(dev->irq);
		__ei_interrupt(dev->irq, dev);
		enable_irq_lockdep(dev->irq);
		enable_irq(dev->irq);
		}
		#endif

Admin message