Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c568fd8 authored by Peter Dunning's avatar Peter Dunning Committed by David S. Miller
Browse files

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: e283546c ("sfc:On MCDI timeout, issue an FLR (and mark MCDI to fail-fast)")
Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 105eac6c

drivers/net/ethernet/sfc/ef10.c

+4 −4
Original line number Diff line number Diff line
@@ -5389,7 +5389,7 @@ static int efx_ef10_vport_set_mac_address(struct efx_nic *efx) 
	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;

drivers/net/ethernet/sfc/ef10_sriov.c

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ int efx_ef10_sriov_set_vf_vlan(struct efx_nic *efx, int vf_i, u16 vlan, 
		if (rc2)

			goto reset_nic;



		netif_device_attach(vf->efx->net_dev);

		efx_device_attach_if_not_resetting(vf->efx);

	}

	return rc;

drivers/net/ethernet/sfc/efx.c

+6 −4
Original line number Diff line number Diff line
@@ -876,7 +876,7 @@ efx_realloc_channels(struct efx_nic *efx, u32 rxq_entries, u32 txq_entries) 
		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 @@ int efx_reset(struct efx_nic *efx, enum reset_type method) 
		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;

drivers/net/ethernet/sfc/efx.h

+6 −0
Original line number Diff line number Diff line
@@ -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))) {

drivers/net/ethernet/sfc/selftest.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}