sfc: do not device_attach if a reset is pending

efx_start_all can return without initialising queues as a reset is pending.
 This means that when netif_device_attach is called, the kernel can start
 sending traffic without having an initialised TX queue to send to.
This patch avoids this by not calling netif_device_attach if there is a
 pending reset.

Fixes: e283546c0465 ("sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)")
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index ec976ffb273f77d367f6b51fc4ca56e3d596c40f..92e1c6d8b2937e0fc15a30162903cca675b4faa7 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -5389,7 +5389,7 @@ restore_filters:
        if (rc2)
                goto reset_nic;
 
-       netif_device_attach(efx->net_dev);
+       efx_device_attach_if_not_resetting(efx);
 
        return rc;
 
@@ -5675,7 +5675,7 @@ static int efx_ef10_set_mac_address(struct efx_nic *efx)
 
        if (was_enabled)
                efx_net_open(efx->net_dev);
-       netif_device_attach(efx->net_dev);
+       efx_device_attach_if_not_resetting(efx);
 
 #ifdef CONFIG_SFC_SRIOV
        if (efx->pci_dev->is_virtfn && efx->pci_dev->physfn) {
@@ -6127,7 +6127,7 @@ static int efx_ef10_set_udp_tnl_ports(struct efx_nic *efx, bool unloading)
 
        if (!(nic_data->datapath_caps &
            (1 << MC_CMD_GET_CAPABILITIES_OUT_VXLAN_NVGRE_LBN))) {
-               netif_device_attach(efx->net_dev);
+               efx_device_attach_if_not_resetting(efx);
                return 0;
        }
 
@@ -6199,7 +6199,7 @@ static int efx_ef10_set_udp_tnl_ports(struct efx_nic *efx, bool unloading)
                 * trigger a re-attach.  Since there won't be an MC reset, we
                 * have to do the attach ourselves.
                 */
-               netif_device_attach(efx->net_dev);
+               efx_device_attach_if_not_resetting(efx);
        }
 
        return rc;

diff --git a/drivers/net/ethernet/sfc/ef10_sriov.c b/drivers/net/ethernet/sfc/ef10_sriov.c
index ed4b14283461357390e000d3947c05ebf20f8d61..b7e4345c990d55454f52cbcb9c7c4d5df66ef176 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10_sriov.c
+++ b/drivers/net/ethernet/sfc/ef10_sriov.c
@@ -549,7 +549,7 @@ int efx_ef10_sriov_set_vf_mac(struct efx_nic *efx, int vf_i, u8 *mac)
                vf->efx->type->filter_table_probe(vf->efx);
                up_write(&vf->efx->filter_sem);
                efx_net_open(vf->efx->net_dev);
-               netif_device_attach(vf->efx->net_dev);
+               efx_device_attach_if_not_resetting(vf->efx);
        }
 
        return 0;
@@ -667,7 +667,7 @@ restore_filters:
                if (rc2)
                        goto reset_nic;
 
-               netif_device_attach(vf->efx->net_dev);
+               efx_device_attach_if_not_resetting(vf->efx);
        }
        return rc;
 

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 8c4c273643dc3932c472e3f30df231f2236c6e2a..334bcc6df6b2ba90a43da4baf7b44cc5ebfa1bac 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -876,7 +876,7 @@ out:
                efx_schedule_reset(efx, RESET_TYPE_DISABLE);
        } else {
                efx_start_all(efx);
-               netif_device_attach(efx->net_dev);
+               efx_device_attach_if_not_resetting(efx);
        }
        return rc;
 
@@ -2182,6 +2182,8 @@ int efx_net_open(struct net_device *net_dev)
        efx_link_status_changed(efx);
 
        efx_start_all(efx);
+       if (efx->state == STATE_DISABLED || efx->reset_pending)
+               netif_device_detach(efx->net_dev);
        efx_selftest_async_start(efx);
        return 0;
 }
@@ -2248,7 +2250,7 @@ static int efx_change_mtu(struct net_device *net_dev, int new_mtu)
        mutex_unlock(&efx->mac_lock);
 
        efx_start_all(efx);
-       netif_device_attach(efx->net_dev);
+       efx_device_attach_if_not_resetting(efx);
        return 0;
 }
 
@@ -2744,7 +2746,7 @@ out:
                efx->state = STATE_DISABLED;
        } else {
                netif_dbg(efx, drv, efx->net_dev, "reset complete\n");
-               netif_device_attach(efx->net_dev);
+               efx_device_attach_if_not_resetting(efx);
        }
        return rc;
 }
@@ -3417,7 +3419,7 @@ static int efx_pm_thaw(struct device *dev)
 
                efx_start_all(efx);
 
-               netif_device_attach(efx->net_dev);
+               efx_device_attach_if_not_resetting(efx);
 
                efx->state = STATE_READY;
 

diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h
index 342ae16e1f2dde07fa03c216ad09c32ac03a82fd..ee14662415c5dfc827a02cb577794af495b0433c 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.h
+++ b/drivers/net/ethernet/sfc/efx.h
@@ -276,6 +276,12 @@ static inline void efx_device_detach_sync(struct efx_nic *efx)
        netif_tx_unlock_bh(dev);
 }
 
+static inline void efx_device_attach_if_not_resetting(struct efx_nic *efx)
+{
+       if ((efx->state != STATE_DISABLED) && !efx->reset_pending)
+               netif_device_attach(efx->net_dev);
+}
+
 static inline bool efx_rwsem_assert_write_locked(struct rw_semaphore *sem)
 {
        if (WARN_ON(down_read_trylock(sem))) {

diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
index cd38b44ae23af330bca1c1b49d60a89b26438814..dab286a337a6bdf21a02387e093ed81516fb427a 100644 (file)
--- a/drivers/net/ethernet/sfc/selftest.c
+++ b/drivers/net/ethernet/sfc/selftest.c
@@ -768,7 +768,7 @@ int efx_selftest(struct efx_nic *efx, struct efx_self_tests *tests,
        __efx_reconfigure_port(efx);
        mutex_unlock(&efx->mac_lock);
 
-       netif_device_attach(efx->net_dev);
+       efx_device_attach_if_not_resetting(efx);
 
        return rc_test;
 }