Commit 7d59706d authored by Mateusz Palczewski's avatar Mateusz Palczewski Committed by Tony Nguyen

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 0cc318d2.

Fixes: 0cc318d2 ("iavf: Fix deadlock occurrence during resetting VF interface")
Signed-off-by: default avatarMateusz Palczewski <mateusz.palczewski@intel.com>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent d7442f51
...@@ -2871,7 +2871,6 @@ static void iavf_reset_task(struct work_struct *work) ...@@ -2871,7 +2871,6 @@ static void iavf_reset_task(struct work_struct *work)
running = adapter->state == __IAVF_RUNNING; running = adapter->state == __IAVF_RUNNING;
if (running) { if (running) {
netdev->flags &= ~IFF_UP;
netif_carrier_off(netdev); netif_carrier_off(netdev);
netif_tx_stop_all_queues(netdev); netif_tx_stop_all_queues(netdev);
adapter->link_up = false; adapter->link_up = false;
...@@ -2988,7 +2987,7 @@ static void iavf_reset_task(struct work_struct *work) ...@@ -2988,7 +2987,7 @@ static void iavf_reset_task(struct work_struct *work)
* to __IAVF_RUNNING * to __IAVF_RUNNING
*/ */
iavf_up_complete(adapter); iavf_up_complete(adapter);
netdev->flags |= IFF_UP;
iavf_irq_enable(adapter, true); iavf_irq_enable(adapter, true);
} else { } else {
iavf_change_state(adapter, __IAVF_DOWN); iavf_change_state(adapter, __IAVF_DOWN);
...@@ -3004,10 +3003,8 @@ static void iavf_reset_task(struct work_struct *work) ...@@ -3004,10 +3003,8 @@ static void iavf_reset_task(struct work_struct *work)
reset_err: reset_err:
mutex_unlock(&adapter->client_lock); mutex_unlock(&adapter->client_lock);
mutex_unlock(&adapter->crit_lock); mutex_unlock(&adapter->crit_lock);
if (running) { if (running)
iavf_change_state(adapter, __IAVF_RUNNING); iavf_change_state(adapter, __IAVF_RUNNING);
netdev->flags |= IFF_UP;
}
dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n"); dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");
iavf_close(netdev); iavf_close(netdev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment