* [PATCH net v3] net: stmmac: remove unneeded stmmac_poll_controller
@ 2023-10-04 14:33 Remi Pommarel
2023-10-05 11:43 ` Simon Horman
2023-10-05 16:40 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Remi Pommarel @ 2023-10-04 14:33 UTC (permalink / raw)
To: Alexandre Torgue, Jose Abreu, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Maxime Coquelin
Cc: netdev, linux-kernel, Remi Pommarel, stable
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 ac3d9dd034e5 ("netpoll: make ndo_poll_controller() optional")
Cc: <stable@vger.kernel.org> # 5.15.x
Fixes: 47dd7a540b8a ("net: add support for STMicroelectronics Ethernet controllers")
Signed-off-by: Remi Pommarel <repk@triplefau.lt>
---
.../net/ethernet/stmicro/stmmac/stmmac_main.c | 30 -------------------
1 file changed, 30 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 83c567a89a46..ed1a5a31a491 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -6002,33 +6002,6 @@ static irqreturn_t stmmac_msi_intr_rx(int irq, void *data)
return IRQ_HANDLED;
}
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/* Polling receive - used by NETCONSOLE and other diagnostic tools
- * to allow network I/O with interrupts disabled.
- */
-static void stmmac_poll_controller(struct net_device *dev)
-{
- struct stmmac_priv *priv = netdev_priv(dev);
- int i;
-
- /* If adapter is down, do nothing */
- if (test_bit(STMMAC_DOWN, &priv->state))
- return;
-
- if (priv->plat->flags & STMMAC_FLAG_MULTI_MSI_EN) {
- for (i = 0; i < priv->plat->rx_queues_to_use; i++)
- stmmac_msi_intr_rx(0, &priv->dma_conf.rx_queue[i]);
-
- for (i = 0; i < priv->plat->tx_queues_to_use; i++)
- stmmac_msi_intr_tx(0, &priv->dma_conf.tx_queue[i]);
- } else {
- disable_irq(dev->irq);
- stmmac_interrupt(dev->irq, dev);
- enable_irq(dev->irq);
- }
-}
-#endif
-
/**
* stmmac_ioctl - Entry point for the Ioctl
* @dev: Device pointer.
@@ -6989,9 +6962,6 @@ static const struct net_device_ops stmmac_netdev_ops = {
.ndo_get_stats64 = stmmac_get_stats64,
.ndo_setup_tc = stmmac_setup_tc,
.ndo_select_queue = stmmac_select_queue,
-#ifdef CONFIG_NET_POLL_CONTROLLER
- .ndo_poll_controller = stmmac_poll_controller,
-#endif
.ndo_set_mac_address = stmmac_set_mac_address,
.ndo_vlan_rx_add_vid = stmmac_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = stmmac_vlan_rx_kill_vid,
--
2.40.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net v3] net: stmmac: remove unneeded stmmac_poll_controller
2023-10-04 14:33 [PATCH net v3] net: stmmac: remove unneeded stmmac_poll_controller Remi Pommarel
@ 2023-10-05 11:43 ` Simon Horman
2023-10-05 16:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2023-10-05 11:43 UTC (permalink / raw)
To: Remi Pommarel
Cc: Alexandre Torgue, Jose Abreu, David S. Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, Maxime Coquelin, netdev,
linux-kernel, stable
On Wed, Oct 04, 2023 at 04:33:56PM +0200, Remi Pommarel wrote:
> 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 ac3d9dd034e5 ("netpoll: make ndo_poll_controller() optional")
>
> Cc: <stable@vger.kernel.org> # 5.15.x
> Fixes: 47dd7a540b8a ("net: add support for STMicroelectronics Ethernet controllers")
> Signed-off-by: Remi Pommarel <repk@triplefau.lt>
Reviewed-by: Simon Horman <horms@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net v3] net: stmmac: remove unneeded stmmac_poll_controller
2023-10-04 14:33 [PATCH net v3] net: stmmac: remove unneeded stmmac_poll_controller Remi Pommarel
2023-10-05 11:43 ` Simon Horman
@ 2023-10-05 16:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-10-05 16:40 UTC (permalink / raw)
To: Remi Pommarel
Cc: alexandre.torgue, joabreu, davem, edumazet, kuba, pabeni,
mcoquelin.stm32, netdev, linux-kernel, stable
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 4 Oct 2023 16:33:56 +0200 you wrote:
> 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
>
> [...]
Here is the summary with links:
- [net,v3] net: stmmac: remove unneeded stmmac_poll_controller
https://git.kernel.org/netdev/net/c/3eef85558910
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-05 16:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-04 14:33 [PATCH net v3] net: stmmac: remove unneeded stmmac_poll_controller Remi Pommarel
2023-10-05 11:43 ` Simon Horman
2023-10-05 16:40 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.