Skip to content

Commit 3eef855

Browse files
repkkuba-moo
authored andcommitted
net: stmmac: remove unneeded stmmac_poll_controller
Using netconsole netpoll_poll_dev could be called from interrupt context, thus using disable_irq() would cause the following kernel warning with CONFIG_DEBUG_ATOMIC_SLEEP enabled: BUG: sleeping function called from invalid context at kernel/irq/manage.c:137 in_atomic(): 1, irqs_disabled(): 128, non_block: 0, pid: 10, name: ksoftirqd/0 CPU: 0 PID: 10 Comm: ksoftirqd/0 Tainted: G W 5.15.42-00075-g816b502b2298-dirty #117 Hardware name: aml (r1) (DT) Call trace: dump_backtrace+0x0/0x270 show_stack+0x14/0x20 dump_stack_lvl+0x8c/0xac dump_stack+0x18/0x30 ___might_sleep+0x150/0x194 __might_sleep+0x64/0xbc synchronize_irq+0x8c/0x150 disable_irq+0x2c/0x40 stmmac_poll_controller+0x140/0x1a0 netpoll_poll_dev+0x6c/0x220 netpoll_send_skb+0x308/0x390 netpoll_send_udp+0x418/0x760 write_msg+0x118/0x140 [netconsole] console_unlock+0x404/0x500 vprintk_emit+0x118/0x250 dev_vprintk_emit+0x19c/0x1cc dev_printk_emit+0x90/0xa8 __dev_printk+0x78/0x9c _dev_warn+0xa4/0xbc ath10k_warn+0xe8/0xf0 [ath10k_core] ath10k_htt_txrx_compl_task+0x790/0x7fc [ath10k_core] ath10k_pci_napi_poll+0x98/0x1f4 [ath10k_pci] __napi_poll+0x58/0x1f4 net_rx_action+0x504/0x590 _stext+0x1b8/0x418 run_ksoftirqd+0x74/0xa4 smpboot_thread_fn+0x210/0x3c0 kthread+0x1fc/0x210 ret_from_fork+0x10/0x20 Since [0] .ndo_poll_controller is only needed if driver doesn't or partially use NAPI. Because stmmac does so, stmmac_poll_controller can be removed fixing the above warning. [0] commit ac3d9dd ("netpoll: make ndo_poll_controller() optional") Cc: <[email protected]> # 5.15.x Fixes: 47dd7a5 ("net: add support for STMicroelectronics Ethernet controllers") Signed-off-by: Remi Pommarel <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://lore.kernel.org/r/1c156a6d8c9170bd6a17825f2277115525b4d50f.1696429960.git.repk@triplefau.lt Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 566aeed commit 3eef855

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6002,33 +6002,6 @@ static irqreturn_t stmmac_msi_intr_rx(int irq, void *data)
60026002
return IRQ_HANDLED;
60036003
}
60046004

6005-
#ifdef CONFIG_NET_POLL_CONTROLLER
6006-
/* Polling receive - used by NETCONSOLE and other diagnostic tools
6007-
* to allow network I/O with interrupts disabled.
6008-
*/
6009-
static void stmmac_poll_controller(struct net_device *dev)
6010-
{
6011-
struct stmmac_priv *priv = netdev_priv(dev);
6012-
int i;
6013-
6014-
/* If adapter is down, do nothing */
6015-
if (test_bit(STMMAC_DOWN, &priv->state))
6016-
return;
6017-
6018-
if (priv->plat->flags & STMMAC_FLAG_MULTI_MSI_EN) {
6019-
for (i = 0; i < priv->plat->rx_queues_to_use; i++)
6020-
stmmac_msi_intr_rx(0, &priv->dma_conf.rx_queue[i]);
6021-
6022-
for (i = 0; i < priv->plat->tx_queues_to_use; i++)
6023-
stmmac_msi_intr_tx(0, &priv->dma_conf.tx_queue[i]);
6024-
} else {
6025-
disable_irq(dev->irq);
6026-
stmmac_interrupt(dev->irq, dev);
6027-
enable_irq(dev->irq);
6028-
}
6029-
}
6030-
#endif
6031-
60326005
/**
60336006
* stmmac_ioctl - Entry point for the Ioctl
60346007
* @dev: Device pointer.
@@ -6989,9 +6962,6 @@ static const struct net_device_ops stmmac_netdev_ops = {
69896962
.ndo_get_stats64 = stmmac_get_stats64,
69906963
.ndo_setup_tc = stmmac_setup_tc,
69916964
.ndo_select_queue = stmmac_select_queue,
6992-
#ifdef CONFIG_NET_POLL_CONTROLLER
6993-
.ndo_poll_controller = stmmac_poll_controller,
6994-
#endif
69956965
.ndo_set_mac_address = stmmac_set_mac_address,
69966966
.ndo_vlan_rx_add_vid = stmmac_vlan_rx_add_vid,
69976967
.ndo_vlan_rx_kill_vid = stmmac_vlan_rx_kill_vid,

0 commit comments

Comments
 (0)