ionic: Add missing err handling for queue reconfig
Subsystems (3)
PATCH 1/1 ionic: Add missing err handling for queue reconfig
From: Nitya Sunkad <[email protected]>
ionic_start_queues_reconfig returns an error code if txrx_init fails. Handle this error code in the relevant places.
This fixes a corner case where the device could get left in a detached state if the CMB reconfig fails and the attempt to clean up the mess also fails. Note that calling netif_device_attach when the netdev is already attached does not lead to unexpected behavior.
Change goto name "errout" to "err_out" to maintain consistency across goto statements.
--- .../net/ethernet/pensando/ionic/ionic_lif.c | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +16 -7
@@ -1817,6 +1817,7 @@ static int ionic_change_mtu(struct net_device *netdev, int new_mtu)static void ionic_tx_timeout_work (struct work_struct *ws) { struct ionic_lif *lif = container_of(ws, struct ionic_lif, tx_timeout_work); +int err;if (test_bit (IONIC_LIF_F_FW_RESET , lif->state))return ;
@@ -1829,8 +1830,11 @@ static void ionic_tx_timeout_work(struct work_struct *ws)mutex_lock (&lif->queue_lock);ionic_stop_queues_reconfig (lif); -ionic_start_queues_reconfig (lif); + err =ionic_start_queues_reconfig (lif);mutex_unlock (&lif->queue_lock); + +if (err) +dev_err (lif->ionic->dev,"%s: Restarting queues failed\n" , __func__); }static void ionic_tx_timeout (struct net_device *netdev,unsigned int txqueue)
@@ -2800,17 +2804,22 @@ static int ionic_cmb_reconfig(struct ionic_lif *lif,if (err) {dev_err (lif->ionic->dev,"CMB restore failed: %d\n" , err); - goto errout; + goto err_out; } } -ionic_start_queues_reconfig (lif); - }else { -/* This was detached in ionic_stop_queues_reconfig() */ -netif_device_attach (lif->netdev); + err =ionic_start_queues_reconfig (lif); +if (err) { +dev_err (lif->ionic->dev, +"CMB reconfig failed: %d\n" , err); + goto err_out; + } } -errout: +err_out: +/* This was detached in ionic_stop_queues_reconfig() */ +netif_device_attach (lif->netdev); +return err; }
Signature · 1 line
2.17.1
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:
Quoted 11 lines · On Fri, 4 Aug 2023 13:56:22 -0700 you wrote:
From: Nitya Sunkad <[email protected]>
ionic_start_queues_reconfigreturns an error code iftxrx_initfails. Handle this error code in the relevant places.This fixes a corner case where the device could get left in a detached state if the CMB reconfig fails and the attempt to clean up the mess also fails. Note that calling
netif_device_attachwhen the netdev is already attached does not lead to unexpected behavior.[...]
Here is the summary with links:
- [net] ionic: Add missing err handling for queue reconfig
https://git.kernel.org/netdev/net/c/52417a95ff2d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html