* [PATCH net v2 0/4] net: don't call dev_kfree_skb() under spin_lock_irqsave()
@ 2022-12-07 13:52 Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 1/4] net: emaclite: " Yang Yingliang
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Yang Yingliang @ 2022-12-07 13:52 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, kuba, pabeni, Yang Yingliang
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_consume_skb_irq() under spin_lock_irqsave() in some drivers, or
move dev_kfree_skb() after spin_unlock_irqrestore().
v1 -> v2:
patch #2 Move dev_kfree_skb() after spin_unlock_irqrestore()
Yang Yingliang (4):
net: emaclite: don't call dev_kfree_skb() under spin_lock_irqsave()
net: ethernet: dnet: don't call dev_kfree_skb() under
spin_lock_irqsave()
hamradio: don't call dev_kfree_skb() under spin_lock_irqsave()
net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave()
drivers/net/ethernet/amd/atarilance.c | 2 +-
drivers/net/ethernet/amd/lance.c | 2 +-
drivers/net/ethernet/dnet.c | 4 ++--
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
drivers/net/hamradio/scc.c | 6 +++---
5 files changed, 8 insertions(+), 8 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net v2 1/4] net: emaclite: don't call dev_kfree_skb() under spin_lock_irqsave()
2022-12-07 13:52 [PATCH net v2 0/4] net: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang
@ 2022-12-07 13:52 ` Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 2/4] net: ethernet: dnet: " Yang Yingliang
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Yang Yingliang @ 2022-12-07 13:52 UTC (permalink / raw)
To: netdev
Cc: davem, edumazet, kuba, pabeni, Yang Yingliang, Michal Simek,
linux-arm-kernel
It is not allowed to call consume_skb() from hardware interrupt context
or with interrupts being disabled. So replace dev_kfree_skb() with
dev_consume_skb_irq() under spin_lock_irqsave().
Fixes: bb81b2ddfa19 ("net: add Xilinx emac lite device driver")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index a3967f8de417..a1e1387ea84e 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -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_consume_skb_irq(lp->deferred_skb);
lp->deferred_skb = NULL;
dev->stats.tx_errors++;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net v2 2/4] net: ethernet: dnet: don't call dev_kfree_skb() under spin_lock_irqsave()
2022-12-07 13:52 [PATCH net v2 0/4] net: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 1/4] net: emaclite: " Yang Yingliang
@ 2022-12-07 13:52 ` Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 3/4] hamradio: " Yang Yingliang
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Yang Yingliang @ 2022-12-07 13:52 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, kuba, pabeni, Yang Yingliang
It is not allowed to call consume_skb() from hardware interrupt
context or with interrupts being disabled. So Call it after the
spin_unlock_irqrestore().
Fixes: 4796417417a6 ("dnet: Dave DNET ethernet controller driver (updated)")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/ethernet/dnet.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c
index 08184f20f510..151ca9573be9 100644
--- a/drivers/net/ethernet/dnet.c
+++ b/drivers/net/ethernet/dnet.c
@@ -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;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net v2 3/4] hamradio: don't call dev_kfree_skb() under spin_lock_irqsave()
2022-12-07 13:52 [PATCH net v2 0/4] net: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 1/4] net: emaclite: " Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 2/4] net: ethernet: dnet: " Yang Yingliang
@ 2022-12-07 13:52 ` Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 4/4] net: amd: lance: " Yang Yingliang
2022-12-08 2:50 ` [PATCH net v2 0/4] net: " Jakub Kicinski
4 siblings, 0 replies; 6+ messages in thread
From: Yang Yingliang @ 2022-12-07 13:52 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, kuba, pabeni, Yang Yingliang, Joerg Reuter
It is not allowed to call consume_skb() from hardware interrupt context
or with interrupts being disabled. So replace dev_kfree_skb() with
dev_consume_skb_irq() under spin_lock_irqsave().
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/hamradio/scc.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index f90830d3dfa6..bd80e8ca6c79 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -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_consume_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_consume_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_consume_skb_irq(skb_del);
}
skb_queue_tail(&scc->tx_queue, skb);
netif_trans_update(dev);
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH net v2 4/4] net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave()
2022-12-07 13:52 [PATCH net v2 0/4] net: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang
` (2 preceding siblings ...)
2022-12-07 13:52 ` [PATCH net v2 3/4] hamradio: " Yang Yingliang
@ 2022-12-07 13:52 ` Yang Yingliang
2022-12-08 2:50 ` [PATCH net v2 0/4] net: " Jakub Kicinski
4 siblings, 0 replies; 6+ messages in thread
From: Yang Yingliang @ 2022-12-07 13:52 UTC (permalink / raw)
To: netdev; +Cc: davem, edumazet, kuba, pabeni, Yang Yingliang
It is not allowed to call consume_skb() from hardware interrupt context
or with interrupts being disabled. So replace dev_kfree_skb() with
dev_consume_skb_irq() under spin_lock_irqsave().
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/net/ethernet/amd/atarilance.c | 2 +-
drivers/net/ethernet/amd/lance.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 3222c48ce6ae..ec704222925d 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -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;
diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c
index fb8686214a32..8971665a4b2a 100644
--- a/drivers/net/ethernet/amd/lance.c
+++ b/drivers/net/ethernet/amd/lance.c
@@ -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;
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net v2 0/4] net: don't call dev_kfree_skb() under spin_lock_irqsave()
2022-12-07 13:52 [PATCH net v2 0/4] net: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang
` (3 preceding siblings ...)
2022-12-07 13:52 ` [PATCH net v2 4/4] net: amd: lance: " Yang Yingliang
@ 2022-12-08 2:50 ` Jakub Kicinski
4 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2022-12-08 2:50 UTC (permalink / raw)
To: Yang Yingliang; +Cc: netdev, davem, edumazet, pabeni, Joe Perches
On Wed, 7 Dec 2022 21:52:54 +0800 Yang Yingliang wrote:
> 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_consume_skb_irq() under spin_lock_irqsave() in some drivers, or
> move dev_kfree_skb() after spin_unlock_irqrestore().
You must CC all authors / reviewers of commits under Fixes:
Run get_maintainer on the _patch file_ not on the path.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-12-08 2:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-07 13:52 [PATCH net v2 0/4] net: don't call dev_kfree_skb() under spin_lock_irqsave() Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 1/4] net: emaclite: " Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 2/4] net: ethernet: dnet: " Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 3/4] hamradio: " Yang Yingliang
2022-12-07 13:52 ` [PATCH net v2 4/4] net: amd: lance: " Yang Yingliang
2022-12-08 2:50 ` [PATCH net v2 0/4] net: " Jakub Kicinski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).