lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: apple: bmac: don't call dev_kfree_skb() under spin_lock_irqsave()

Browse Source 
[ Upstream commit 5fe02e046e6422c4adfdbc50206ec7186077da24 ]

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 bmac_tx_timeout() to drop
the SKB, when tx timeout, so replace it with dev_kfree_skb_irq().

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang 2022-12-08 21:37:35 +08:00 committed by Greg Kroah-Hartman
parent bc51a3cadf
commit 4b8256d9bf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/apple/bmac.c
View File

@ -1511,7 +1511,7 @@ static void bmac_tx_timeout(struct timer_list *t)
i = bp->tx_empty; i = bp->tx_empty;
++dev->stats.tx_errors; ++dev->stats.tx_errors;
if (i != bp->tx_fill) { if (i != bp->tx_fill) {
dev_kfree_skb(bp->tx_bufs[i]); dev_kfree_skb_irq(bp->tx_bufs[i]);
bp->tx_bufs[i] = NULL; bp->tx_bufs[i] = NULL;
if (++i >= N_TX_RING) i = 0; if (++i >= N_TX_RING) i = 0;
bp->tx_empty = i; bp->tx_empty = i;