Revert "iavf: Fix deadlock occurrence during resetting VF interface"
Subsystems (2)
PATCH 1/1 Revert "iavf: Fix deadlock occurrence during resetting VF interface"
This change caused a regression with resetting while changing network namespaces. By clearing the IFF_UP flag, the kernel now thinks it has fully closed the device.
This reverts commit 0cc318d2e8408bc0ffb4662a0c3e5e57005ac6ff.
--- drivers/net/ethernet/intel/iavf/iavf_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/iavf/iavf_main.c +2 -5
@@ -2706,7 +2706,6 @@ static void iavf_reset_task(struct work_struct *work) running = adapter->state == __IAVF_RUNNING;if (running) { - netdev->flags &= ~IFF_UP ;netif_carrier_off (netdev);netif_tx_stop_all_queues (netdev); adapter->link_up = false;
@@ -2821,7 +2820,7 @@ static void iavf_reset_task(struct work_struct *work)* to __IAVF_RUNNING */ iavf_up_complete (adapter); - netdev->flags |=IFF_UP ; +iavf_irq_enable (adapter, true); }else {iavf_change_state (adapter, __IAVF_DOWN);
@@ -2837,10 +2836,8 @@ static void iavf_reset_task(struct work_struct *work) reset_err:mutex_unlock (&adapter->client_lock);mutex_unlock (&adapter->crit_lock); -if (running) { +if (running)iavf_change_state (adapter, __IAVF_RUNNING); - netdev->flags |=IFF_UP ; - }dev_err (&adapter->pdev->dev,"failed to allocate resources during reinit\n" );iavf_close (netdev); }
Signature · 1 line
2.27.0
Jankowski
PATCH 1/1 Revert "iavf: Fix deadlock occurrence during resetting VF interface"
drivers/net/ethernet/intel/iavf/iavf_main.c static void iavf_reset_task(struct work_struct
Quoted 28 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Mateusz Palczewski
Sent: Thursday, March 24, 2022 2:19 PM
To: intel-wired-lan at lists.osuosl.org
Cc: Palczewski, Mateusz <[email protected]>
Subject: [Intel-wired-lan] [PATCH net v1] Revert "iavf: Fix deadlock occurrence during resetting VF interface"This change caused a regression with resetting while changing network namespaces. By clearing the
IFF_UPflag, the kernel now thinks it has fully closed the device.This reverts commit
0cc318d2e8408bc0ffb4662a0c3e5e57005ac6ff.Signed-off-by Mateusz Palczewski <[email protected]>--- drivers/net/ethernet/intel/iavf/iavf_main.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)drivers/net/ethernet/intel/iavf/iavf_main.c +0
-0@@ -2706,7 +2706,6 @@ static void iavf_reset_task(struct work_struct