ixgbe: Fix memory leak when SR-IOV VFs are direct assigned

The VF driver had a memory leak that would occur if VFs were assigned to a
guest.  The amount of leak would vary with the number of VFs but could max
out at about 14K per PF.  To reproduce the leak all you would need to do is
enable all the VFs on the first PF.  Then start a loop of loading and
unloading the driver with max_vfs=63 for the first port.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index c7d831d6e21234a21d3d0ab68ecc8c2e401474aa..4f22668b6aea651f33edd8e3e50cabef513c1bb0 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -208,6 +208,17 @@ void ixgbe_disable_sriov(struct ixgbe_adapter *adapter)
        u32 vmdctl;
        int i;
 
+       /* set num VFs to 0 to prevent access to vfinfo */
+       adapter->num_vfs = 0;
+
+       /* free VF control structures */
+       kfree(adapter->vfinfo);
+       adapter->vfinfo = NULL;
+
+       /* free macvlan list */
+       kfree(adapter->mv_list);
+       adapter->mv_list = NULL;
+
 #ifdef CONFIG_PCI_IOV
        /* disable iov and allow time for transactions to clear */
        pci_disable_sriov(adapter->pdev);
@@ -238,11 +249,7 @@ void ixgbe_disable_sriov(struct ixgbe_adapter *adapter)
                if (adapter->vfinfo[i].vfdev)
                        pci_dev_put(adapter->vfinfo[i].vfdev);
        }
-       kfree(adapter->vfinfo);
-       kfree(adapter->mv_list);
-       adapter->vfinfo = NULL;
 
-       adapter->num_vfs = 0;
        adapter->flags &= ~IXGBE_FLAG_SRIOV_ENABLED;
 }