lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 049/100] iavf: free q_vectors before queues in iavf_disable_vf
    Date
    From: Nicholas Nunley <nicholas.d.nunley@intel.com>

    [ Upstream commit 89f22f129696ab53cfbc608e0a2184d0fea46ac1 ]

    iavf_free_queues() clears adapter->num_active_queues, which
    iavf_free_q_vectors() relies on, so swap the order of these two function
    calls in iavf_disable_vf(). This resolves a panic encountered when the
    interface is disabled and then later brought up again after PF
    communication is restored.

    Fixes: 65c7006f234c ("i40evf: assign num_active_queues inside i40evf_alloc_queues")
    Signed-off-by: Nicholas Nunley <nicholas.d.nunley@intel.com>
    Tested-by: Tony Brelinski <tony.brelinski@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
    index d6a239ba0240e..c7e365267bc0f 100644
    --- a/drivers/net/ethernet/intel/iavf/iavf_main.c
    +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
    @@ -2057,8 +2057,8 @@ static void iavf_disable_vf(struct iavf_adapter *adapter)

    iavf_free_misc_irq(adapter);
    iavf_reset_interrupt_capability(adapter);
    - iavf_free_queues(adapter);
    iavf_free_q_vectors(adapter);
    + iavf_free_queues(adapter);
    memset(adapter->vf_res, 0, IAVF_VIRTCHNL_VF_RESOURCE_SIZE);
    iavf_shutdown_adminq(&adapter->hw);
    adapter->netdev->flags &= ~IFF_UP;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 14:22    [W:4.208 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site