Patch "iavf: in iavf_down, disable queues when removing the driver" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    iavf: in iavf_down, disable queues when removing the driver

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     iavf-in-iavf_down-disable-queues-when-removing-the-d.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 8d3bde1046f7d9748b1be8d9630f8ade0d6522c7
Author: Michal Schmidt <mschmidt@xxxxxxxxxx>
Date:   Wed Oct 25 11:32:13 2023 -0700

    iavf: in iavf_down, disable queues when removing the driver
    
    [ Upstream commit 53798666648af3aa0dd512c2380576627237a800 ]
    
    In iavf_down, we're skipping the scheduling of certain operations if
    the driver is being removed. However, the IAVF_FLAG_AQ_DISABLE_QUEUES
    request must not be skipped in this case, because iavf_close waits
    for the transition to the __IAVF_DOWN state, which happens in
    iavf_virtchnl_completion after the queues are released.
    
    Without this fix, "rmmod iavf" takes half a second per interface that's
    up and prints the "Device resources not yet released" warning.
    
    Fixes: c8de44b577eb ("iavf: do not process adminq tasks when __IAVF_IN_REMOVE_TASK is set")
    Signed-off-by: Michal Schmidt <mschmidt@xxxxxxxxxx>
    Reviewed-by: Wojciech Drewek <wojciech.drewek@xxxxxxxxx>
    Tested-by: Rafal Romanowski <rafal.romanowski@xxxxxxxxx>
    Tested-by: Jacob Keller <jacob.e.keller@xxxxxxxxx>
    Signed-off-by: Jacob Keller <jacob.e.keller@xxxxxxxxx>
    Link: https://lore.kernel.org/r/20231025183213.874283-1-jacob.e.keller@xxxxxxxxx
    Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 1ae90f8f9941f..326bb5fdf5f90 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -1449,9 +1449,9 @@ void iavf_down(struct iavf_adapter *adapter)
 			adapter->aq_required |= IAVF_FLAG_AQ_DEL_FDIR_FILTER;
 		if (!list_empty(&adapter->adv_rss_list_head))
 			adapter->aq_required |= IAVF_FLAG_AQ_DEL_ADV_RSS_CFG;
-		adapter->aq_required |= IAVF_FLAG_AQ_DISABLE_QUEUES;
 	}
 
+	adapter->aq_required |= IAVF_FLAG_AQ_DISABLE_QUEUES;
 	mod_delayed_work(adapter->wq, &adapter->watchdog_task, 0);
 }