Commit 1b1661f6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-dev_kfree_skb_irq' 



Yang Yingliang says:

====================
net: don't call dev_kfree_skb() under spin_lock_irqsave()

It is not allowed to call consume_skb() from hardware interrupt context
or with interrupts being disabled. This patchset replace dev_kfree_skb()
with dev_kfree_skb_irq/dev_consume_skb_irq() under spin_lock_irqsave()
in some drivers, or move dev_kfree_skb() after spin_unlock_irqrestore().

v2 -> v3:
  Update commit message, and change to use dev_kfree_skb_irq() in patch #1, #3.

v1 -> v2:
  patch #2 Move dev_kfree_skb() after spin_unlock_irqrestore()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5fe02e04 6151d105

drivers/net/ethernet/amd/atarilance.c

+1 −1
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ lance_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	lp->memcpy_f( PKTBUF_ADDR(head), (void *)skb->data, skb->len );

	head->flag = TMD1_OWN_CHIP | TMD1_ENP | TMD1_STP;

	dev->stats.tx_bytes += skb->len;

	dev_kfree_skb( skb );

	dev_consume_skb_irq(skb);

	lp->cur_tx++;

	while( lp->cur_tx >= TX_RING_SIZE && lp->dirty_tx >= TX_RING_SIZE ) {

		lp->cur_tx -= TX_RING_SIZE;

drivers/net/ethernet/amd/lance.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb, 
		skb_copy_from_linear_data(skb, &lp->tx_bounce_buffs[entry], skb->len);

		lp->tx_ring[entry].base =

			((u32)isa_virt_to_bus((lp->tx_bounce_buffs + entry)) & 0xffffff) | 0x83000000;

		dev_kfree_skb(skb);

		dev_consume_skb_irq(skb);

	} else {

		lp->tx_skbuff[entry] = skb;

		lp->tx_ring[entry].base = ((u32)isa_virt_to_bus(skb->data) & 0xffffff) | 0x83000000;

drivers/net/ethernet/dnet.c

+2 −2
Original line number Diff line number Diff line
@@ -550,11 +550,11 @@ static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev) 


	skb_tx_timestamp(skb);



	spin_unlock_irqrestore(&bp->lock, flags);



	/* free the buffer */

	dev_kfree_skb(skb);



	spin_unlock_irqrestore(&bp->lock, flags);



	return NETDEV_TX_OK;

}

drivers/net/ethernet/xilinx/xilinx_emaclite.c

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static void xemaclite_tx_timeout(struct net_device *dev, unsigned int txqueue) 
	xemaclite_enable_interrupts(lp);



	if (lp->deferred_skb) {

		dev_kfree_skb(lp->deferred_skb);

		dev_kfree_skb_irq(lp->deferred_skb);

		lp->deferred_skb = NULL;

		dev->stats.tx_errors++;

	}

drivers/net/hamradio/scc.c

+3 −3
Original line number Diff line number Diff line
@@ -302,12 +302,12 @@ static inline void scc_discard_buffers(struct scc_channel *scc) 
	spin_lock_irqsave(&scc->lock, flags);	

	if (scc->tx_buff != NULL)

	{

		dev_kfree_skb(scc->tx_buff);

		dev_kfree_skb_irq(scc->tx_buff);

		scc->tx_buff = NULL;

	}

	

	while (!skb_queue_empty(&scc->tx_queue))

		dev_kfree_skb(skb_dequeue(&scc->tx_queue));

		dev_kfree_skb_irq(skb_dequeue(&scc->tx_queue));



	spin_unlock_irqrestore(&scc->lock, flags);

}
@@ -1668,7 +1668,7 @@ static netdev_tx_t scc_net_tx(struct sk_buff *skb, struct net_device *dev) 
	if (skb_queue_len(&scc->tx_queue) > scc->dev->tx_queue_len) {

		struct sk_buff *skb_del;

		skb_del = skb_dequeue(&scc->tx_queue);

		dev_kfree_skb(skb_del);

		dev_kfree_skb_irq(skb_del);

	}

	skb_queue_tail(&scc->tx_queue, skb);

	netif_trans_update(dev);