i40evf: Fixed guest OS panic when removing vf driver
authorSerey Kong <serey.kong@intel.com>
Fri, 1 Aug 2014 20:27:15 +0000 (13:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 3 Aug 2014 02:41:15 +0000 (19:41 -0700)
Removing VF driver during device still in reset caused guest OS panic.

in the i40evf_remove(), we're trying to clean mac_filter_list which has
not been initialized since the device is still stuck at the reset.
The change is to initialize the filter_list before setting any task.

Change-ID: I8b59df7384416c7e6f2d264b598f447e1c2c92b0
Signed-off-by: Serey Kong <serey.kong@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/i40evf/i40evf_main.c

index e5679d82e0c01e0c46af01aba2f1b719a21de6b2..ab15f4d07e4198ef041ed3f3651c587dfa27329e 100644 (file)
@@ -2137,8 +2137,6 @@ static void i40evf_init_task(struct work_struct *work)
        ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr);
        ether_addr_copy(netdev->perm_addr, adapter->hw.mac.addr);
 
-       INIT_LIST_HEAD(&adapter->mac_filter_list);
-       INIT_LIST_HEAD(&adapter->vlan_filter_list);
        f = kzalloc(sizeof(*f), GFP_ATOMIC);
        if (NULL == f)
                goto err_sw_init;
@@ -2320,6 +2318,9 @@ static int i40evf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        hw->bus.device = PCI_SLOT(pdev->devfn);
        hw->bus.func = PCI_FUNC(pdev->devfn);
 
+       INIT_LIST_HEAD(&adapter->mac_filter_list);
+       INIT_LIST_HEAD(&adapter->vlan_filter_list);
+
        INIT_WORK(&adapter->reset_task, i40evf_reset_task);
        INIT_WORK(&adapter->adminq_task, i40evf_adminq_task);
        INIT_WORK(&adapter->watchdog_task, i40evf_watchdog_task);