Commit a8417330 authored by Slawomir Laba's avatar Slawomir Laba Committed by Tony Nguyen
Browse files

iavf: Fix race condition between iavf_shutdown and iavf_remove 



Fix a deadlock introduced by commit
97457801 ("iavf: Add waiting so the port is initialized in remove")
due to race condition between iavf_shutdown and iavf_remove, where
iavf_remove stucks forever in while loop since iavf_shutdown already
set __IAVF_REMOVE adapter state.

Fix this by checking if the __IAVF_IN_REMOVE_TASK has already been
set and return if so.

Fixes: 97457801 ("iavf: Add waiting so the port is initialized in remove")
Signed-off-by: default avatarSlawomir Laba <slawomirx.laba@intel.com>
Signed-off-by: default avatarMateusz Palczewski <mateusz.palczewski@intel.com>
Tested-by: default avatarMarek Szlosek <marek.szlosek@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent bb861c14

drivers/net/ethernet/intel/iavf/iavf_main.c

+7 −9
Original line number Diff line number Diff line
@@ -5042,23 +5042,21 @@ static int __maybe_unused iavf_resume(struct device *dev_d) 
static void iavf_remove(struct pci_dev *pdev)

{

	struct iavf_adapter *adapter = iavf_pdev_to_adapter(pdev);

	struct net_device *netdev = adapter->netdev;

	struct iavf_fdir_fltr *fdir, *fdirtmp;

	struct iavf_vlan_filter *vlf, *vlftmp;

	struct iavf_cloud_filter *cf, *cftmp;

	struct iavf_adv_rss *rss, *rsstmp;

	struct iavf_mac_filter *f, *ftmp;

	struct iavf_cloud_filter *cf, *cftmp;

	struct iavf_hw *hw = &adapter->hw;

	struct net_device *netdev;

	struct iavf_hw *hw;

	int err;



	/* When reboot/shutdown is in progress no need to do anything

	 * as the adapter is already REMOVE state that was set during

	 * iavf_shutdown() callback.

	 */

	if (adapter->state == __IAVF_REMOVE)

	netdev = adapter->netdev;

	hw = &adapter->hw;



	if (test_and_set_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section))

		return;



	set_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section);

	/* Wait until port initialization is complete.

	 * There are flows where register/unregister netdev may race.

	 */