sfc: force removal of VF and vport on driver removal

When the driver unloads, force the unbind and removal of any
VFs in the host with the PF.  The PF cannot remove vports and
vswitches if they are still being used by a VF driver, and when
unloading the sfc driver the removal order is not guaranteed,
so the instruction from the PF to the VF to unbind enforces a
suitable ordering so that vswitches and vports can be removed.

As a result of this, manually unbinding the driver from a single
PF will result in all of its VFs in the host also being removed.

Signed-off-by: Shradha Shah <sshah@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c
index 083c534bc4ec2398662a4dace53951085eeb582e..41ab18d4b1073ead104713a65bce828b09e64a7f 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10_sriov.c
+++ b/drivers/net/ethernet/sfc/ef10_sriov.c
@@ -448,11 +448,20 @@ int efx_ef10_sriov_init(struct efx_nic *efx)
 void efx_ef10_sriov_fini(struct efx_nic *efx)
 {
        struct efx_ef10_nic_data *nic_data = efx->nic_data;
+       unsigned int i;
        int rc;
 
        if (!nic_data->vf)
                return;
 
+       /* Remove any VFs in the host */
+       for (i = 0; i < efx->vf_count; ++i) {
+               struct efx_nic *vf_efx = nic_data->vf[i].efx;
+
+               if (vf_efx)
+                       vf_efx->pci_dev->driver->remove(vf_efx->pci_dev);
+       }
+
        rc = efx_ef10_pci_sriov_disable(efx);
        if (rc)
                netif_dbg(efx, drv, efx->net_dev,

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index de16cec7ec61d770db4c101213b9a87a301ed28b..62b2139734336d6542f72d528d125968d1e8d387 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -2902,7 +2902,8 @@ static void efx_pci_remove_main(struct efx_nic *efx)
 }
 
 /* Final NIC shutdown
- * This is called only at module unload (or hotplug removal).
+ * This is called only at module unload (or hotplug removal).  A PF can call
+ * this on its VFs to ensure they are unbound first.
  */
 static void efx_pci_remove(struct pci_dev *pci_dev)
 {