diff mbox series

[net,v2] net: stmmac: Disable Tx queues when reconfiguring the interface

Message ID 20211124154731.1676949-1-yannick.vignon@oss.nxp.com (mailing list archive)
State Accepted
Commit b270bfe697367776eca2e6759a71d700fb8d82a2
Delegated to: Netdev Maintainers
Headers show
Series [net,v2] net: stmmac: Disable Tx queues when reconfiguring the interface | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for net
netdev/fixes_present success Fixes tag present in non-next series
netdev/subject_prefix success Link
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers fail 2 blamed authors not CCed: weifeng.voon@intel.com yoong.siang.song@intel.com; 9 maintainers not CCed: bpf@vger.kernel.org weifeng.voon@intel.com daniel@iogearbox.net hawk@kernel.org linux-stm32@st-md-mailman.stormreply.com linux-arm-kernel@lists.infradead.org yoong.siang.song@intel.com john.fastabend@gmail.com ast@kernel.org
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Yannick Vignon Nov. 24, 2021, 3:47 p.m. UTC 
From: Yannick Vignon <yannick.vignon@nxp.com>

The Tx queues were not disabled in situations where the driver needed to
stop the interface to apply a new configuration. This could result in a
kernel panic when doing any of the 3 following actions:
* reconfiguring the number of queues (ethtool -L)
* reconfiguring the size of the ring buffers (ethtool -G)
* installing/removing an XDP program (ip l set dev ethX xdp)

Prevent the panic by making sure netif_tx_disable is called when stopping
an interface.

Without this patch, the following kernel panic can be observed when doing
any of the actions above:

Unable to handle kernel paging request at virtual address ffff80001238d040
[....]
 Call trace:
  dwmac4_set_addr+0x8/0x10
  dev_hard_start_xmit+0xe4/0x1ac
  sch_direct_xmit+0xe8/0x39c
  __dev_queue_xmit+0x3ec/0xaf0
  dev_queue_xmit+0x14/0x20
[...]
[ end trace 0000000000000002 ]---

Fixes: 5fabb01207a2d ("net: stmmac: Add initial XDP support")
Fixes: aa042f60e4961 ("net: stmmac: Add support to Ethtool get/set ring parameters")
Fixes: 0366f7e06a6be ("net: stmmac: add ethtool support for get/set channels")
Signed-off-by: Yannick Vignon <yannick.vignon@nxp.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

patchwork-bot+netdevbpf@kernel.org Nov. 26, 2021, 7:20 p.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 24 Nov 2021 16:47:31 +0100 you wrote:
> From: Yannick Vignon <yannick.vignon@nxp.com>
> 
> The Tx queues were not disabled in situations where the driver needed to
> stop the interface to apply a new configuration. This could result in a
> kernel panic when doing any of the 3 following actions:
> * reconfiguring the number of queues (ethtool -L)
> * reconfiguring the size of the ring buffers (ethtool -G)
> * installing/removing an XDP program (ip l set dev ethX xdp)
> 
> [...]

Here is the summary with links:
  - [net,v2] net: stmmac: Disable Tx queues when reconfiguring the interface
    https://git.kernel.org/netdev/net/c/b270bfe69736

You are awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index f12097c8a485..748195697e5a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3802,6 +3802,8 @@  int stmmac_release(struct net_device *dev)
 	struct stmmac_priv *priv = netdev_priv(dev);
 	u32 chan;
 
+	netif_tx_disable(dev);
+
 	if (device_may_wakeup(priv->device))
 		phylink_speed_down(priv->phylink, false);
 	/* Stop and disconnect the PHY */