Message ID | 20221208120121.2076486-1-yangyingliang@huawei.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 6cee96e09df54ae17784c0f38a49e0ed8229b825 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net,v4] ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave() | expand |
On Thu, 8 Dec 2022 20:01:21 +0800 Yang Yingliang wrote: > It is not allowed to call kfree_skb() or consume_skb() from hardware > interrupt context or with hardware interrupts being disabled. > > It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. > The difference between them is free reason, dev_kfree_skb_irq() means > the SKB is dropped in error and dev_consume_skb_irq() means the SKB > is consumed in normal. > > In this case, dev_kfree_skb() is called in free_tx_buffers() to drop > the SKBs in tx buffers, when the card is down, so replace it with > dev_kfree_skb_irq() here. Make sure you read this: https://www.kernel.org/doc/html/next/process/maintainer-netdev.html
On 2022/12/9 0:47, Jakub Kicinski wrote: > On Thu, 8 Dec 2022 20:01:21 +0800 Yang Yingliang wrote: >> It is not allowed to call kfree_skb() or consume_skb() from hardware >> interrupt context or with hardware interrupts being disabled. >> >> It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. >> The difference between them is free reason, dev_kfree_skb_irq() means >> the SKB is dropped in error and dev_consume_skb_irq() means the SKB >> is consumed in normal. >> >> In this case, dev_kfree_skb() is called in free_tx_buffers() to drop >> the SKBs in tx buffers, when the card is down, so replace it with >> dev_kfree_skb_irq() here. > Make sure you read this: > > https://www.kernel.org/doc/html/next/process/maintainer-netdev.html OK. Thanks, Yang > .
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 8 Dec 2022 20:01:21 +0800 you wrote: > It is not allowed to call kfree_skb() or consume_skb() from hardware > interrupt context or with hardware interrupts being disabled. > > It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. > The difference between them is free reason, dev_kfree_skb_irq() means > the SKB is dropped in error and dev_consume_skb_irq() means the SKB > is consumed in normal. > > [...] Here is the summary with links: - [net,v4] ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave() https://git.kernel.org/netdev/net/c/6cee96e09df5 You are awesome, thank you!
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 1d3c4474b7cb..a83d61d45936 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c @@ -2386,7 +2386,7 @@ static void free_tx_buffers(struct s2io_nic *nic) skb = s2io_txdl_getskb(&mac_control->fifos[i], txdp, j); if (skb) { swstats->mem_freed += skb->truesize; - dev_kfree_skb(skb); + dev_kfree_skb_irq(skb); cnt++; } }
It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled. It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal. In this case, dev_kfree_skb() is called in free_tx_buffers() to drop the SKBs in tx buffers, when the card is down, so replace it with dev_kfree_skb_irq() here. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- v4 -> v3: Update commit message, and change to use dev_kfree_skb_irq(). v2 -> v3: Update commit message. v1 -> v2: Add fix tag. --- drivers/net/ethernet/neterion/s2io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)