]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40e: amortize wait time when disabling lots of VFs
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 19 Apr 2017 13:25:52 +0000 (09:25 -0400)
committerJack Vogel <jack.vogel@oracle.com>
Tue, 10 Oct 2017 21:15:23 +0000 (14:15 -0700)
Just as we do in i40e_reset_all_vfs, save some time when freeing VFs by
amortizing the wait time for stopping queues. We can use
i40e_vsi_stop_rings_no_wait() to begin the process of stopping all the
VF rings at once. Then, once we've started the process on each VF we can
begin waiting for the VFs to stop. This helps reduce the total wait time
by a large factor.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 26785018
(cherry picked from commit 707d088af33043642692d4522225cb9ca638e7ee)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Kyle Fortin <kyle.fortin@oracle.com>
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

index dc71aeb46cd30450d0ea4431e0a091376ea82621..ebb84089df091ac1570c9d5234b48ce4479fa90d 100644 (file)
@@ -1194,9 +1194,21 @@ void i40e_free_vfs(struct i40e_pf *pf)
                usleep_range(1000, 2000);
 
        i40e_notify_client_of_vf_enable(pf, 0);
-       for (i = 0; i < pf->num_alloc_vfs; i++)
+
+       /* Amortize wait time by stopping all VFs at the same time */
+       for (i = 0; i < pf->num_alloc_vfs; i++) {
+               if (test_bit(I40E_VF_STATE_INIT, &pf->vf[i].vf_states))
+                       continue;
+
+               i40e_vsi_stop_rings_no_wait(pf->vsi[pf->vf[i].lan_vsi_idx]);
+       }
+
+       for (i = 0; i < pf->num_alloc_vfs; i++) {
                if (test_bit(I40E_VF_STATE_INIT, &pf->vf[i].vf_states))
-                       i40e_vsi_stop_rings(pf->vsi[pf->vf[i].lan_vsi_idx]);
+                       continue;
+
+               i40e_vsi_wait_queues_disabled(pf->vsi[pf->vf[i].lan_vsi_idx]);
+       }
 
        /* Disable IOV before freeing resources. This lets any VF drivers
         * running in the host get themselves cleaned up before we yank