Commit 6ef2977d authored Mar 23, 2008 by Marin Mitov Committed by Jeff Garzik Mar 25, 2008

skge napi->poll() locking bug



According to: Documentation/networking/netdevices.txt:

<cite>
napi->poll:
..........
	Context: softirq
	         will be called with interrupts disabled by netconsole.
</cite>

napi->poll() could be called either with interrupts enabled
(in softirq context) or disabled (by netconsole), so the irq flag
should be preserved.

Inspired by Ingo's resent forcedeth patch :-)

Signed-off-by: Marin Mitov <mitov@issp.bas.bg>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

parent 9f5e60dd

drivers/net/skge.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -3199,12 +3199,14 @@ static int skge_poll(struct napi_struct *napi, int to_do)
		skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START);

		if (work_done < to_do) {
		spin_lock_irq(&hw->hw_lock);
		unsigned long flags;

		spin_lock_irqsave(&hw->hw_lock, flags);
		__netif_rx_complete(dev, napi);
		hw->intr_mask \|= napimask[skge->port];
		skge_write32(hw, B0_IMSK, hw->intr_mask);
		skge_read32(hw, B0_IMSK);
		spin_unlock_irq(&hw->hw_lock);
		spin_unlock_irqrestore(&hw->hw_lock, flags);
		}

		return work_done;

Admin message