openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ice: Fix probe/open race condition 

As soon as the driver registers the PF netdev, userspace utilities
like NetworkManager try to bring up the associated interface. When
this happens, the driver may not have finished initializing fully,
resulting in a bunch of errors in the interface up flow.

The driver already has a mechanism to indicate if it's not up yet;
by setting the __ICE_DOWN bit in pf->state, but this bit gets
cleared too early in the current flow. So clear this bit only when
the driver is fully up. Also check for the same bit in the ice_open
flow, and return -EBUSY if the bit is set.

Also in ice_open, replace references of vsi->back with a local
variable.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Anirudh Venkataramanan 2020-05-07 17:41:03 -07:00 committed by Jeff Kirsher
parent 46a316500e
commit de75135b5c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ethernet/intel/ice/ice_main.c
View File

@ -2137,10 +2137,8 @@ static irqreturn_t ice_misc_intr(int __always_unused irq, void *data)
} }
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
if (!test_bit(__ICE_DOWN, pf->state)) { ice_service_task_schedule(pf);
ice_service_task_schedule(pf); ice_irq_dynamic_ena(hw, NULL, NULL);
ice_irq_dynamic_ena(hw, NULL, NULL);
}
return ret; return ret;
} }
@ -3312,9 +3310,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
goto err_init_interrupt_unroll; goto err_init_interrupt_unroll;
} }
/* Driver is mostly up */
clear_bit(__ICE_DOWN, pf->state);
/* In case of MSIX we are going to setup the misc vector right here /* In case of MSIX we are going to setup the misc vector right here
* to handle admin queue events etc. In case of legacy and MSI * to handle admin queue events etc. In case of legacy and MSI
* the misc functionality and queue processing is combined in * the misc functionality and queue processing is combined in
@ -3370,9 +3365,9 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
ice_verify_cacheline_size(pf); ice_verify_cacheline_size(pf);
/* If no DDP driven features have to be setup, return here */ /* If no DDP driven features have to be setup, we are done with probe */
if (ice_is_safe_mode(pf)) if (ice_is_safe_mode(pf))
return 0; goto probe_done;
/* initialize DDP driven features */ /* initialize DDP driven features */
@ -3387,6 +3382,9 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
/* print PCI link speed and width */ /* print PCI link speed and width */
pcie_print_link_status(pf->pdev); pcie_print_link_status(pf->pdev);
probe_done:
/* ready to go, so clear down state bit */
clear_bit(__ICE_DOWN, pf->state);
return 0; return 0;
err_alloc_sw_unroll: err_alloc_sw_unroll:
@ -5261,14 +5259,20 @@ int ice_open(struct net_device *netdev)
{ {
struct ice_netdev_priv *np = netdev_priv(netdev); struct ice_netdev_priv *np = netdev_priv(netdev);
struct ice_vsi *vsi = np->vsi; struct ice_vsi *vsi = np->vsi;
struct ice_pf *pf = vsi->back;
struct ice_port_info *pi; struct ice_port_info *pi;
int err; int err;
if (test_bit(__ICE_NEEDS_RESTART, vsi->back->state)) { if (test_bit(__ICE_NEEDS_RESTART, pf->state)) {
netdev_err(netdev, "driver needs to be unloaded and reloaded\n"); netdev_err(netdev, "driver needs to be unloaded and reloaded\n");
return -EIO; return -EIO;
} }
if (test_bit(__ICE_DOWN, pf->state)) {
netdev_err(netdev, "device is not ready yet\n");
return -EBUSY;
}
netif_carrier_off(netdev); netif_carrier_off(netdev);
pi = vsi->port_info; pi = vsi->port_info;