Commit 7598f4b4 authored by Marcin Szycik's avatar Marcin Szycik Committed by Tony Nguyen
Browse files

iavf: Move netdev_update_features() into watchdog task 



Remove netdev_update_features() from iavf_adminq_task(), as it can cause
deadlocks due to needing rtnl_lock. Instead use the
IAVF_FLAG_SETUP_NETDEV_FEATURES flag to indicate that netdev features need
to be updated in the watchdog task. iavf_set_vlan_offload_features()
and iavf_set_queue_vlan_tag_loc() can be called directly from
iavf_virtchnl_completion().

Suggested-by: default avatarPhani Burra <phani.r.burra@intel.com>
Signed-off-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Reviewed-by: default avatarAlexander Lobakin <alexandr.lobakin@intel.com>
Tested-by: default avatarMarek Szlosek <marek.szlosek@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 4411a608

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

+9 −18
Original line number Diff line number Diff line
@@ -2692,6 +2692,15 @@ static void iavf_watchdog_task(struct work_struct *work) 
		goto restart_watchdog;

	}



	if ((adapter->flags & IAVF_FLAG_SETUP_NETDEV_FEATURES) &&

	    adapter->netdev_registered &&

	    !test_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section) &&

	    rtnl_trylock()) {

		netdev_update_features(adapter->netdev);

		rtnl_unlock();

		adapter->flags &= ~IAVF_FLAG_SETUP_NETDEV_FEATURES;

	}



	if (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED)

		iavf_change_state(adapter, __IAVF_COMM_FAILED);
@@ -3233,24 +3242,6 @@ static void iavf_adminq_task(struct work_struct *work) 
	} while (pending);

	mutex_unlock(&adapter->crit_lock);



	if ((adapter->flags & IAVF_FLAG_SETUP_NETDEV_FEATURES)) {

		if (adapter->netdev_registered ||

		    !test_bit(__IAVF_IN_REMOVE_TASK, &adapter->crit_section)) {

			struct net_device *netdev = adapter->netdev;



			rtnl_lock();

			netdev_update_features(netdev);

			rtnl_unlock();

			/* Request VLAN offload settings */

			if (VLAN_V2_ALLOWED(adapter))

				iavf_set_vlan_offload_features

					(adapter, 0, netdev->features);



			iavf_set_queue_vlan_tag_loc(adapter);

		}



		adapter->flags &= ~IAVF_FLAG_SETUP_NETDEV_FEATURES;

	}

	if ((adapter->flags &

	     (IAVF_FLAG_RESET_PENDING | IAVF_FLAG_RESET_NEEDED)) ||

	    adapter->state == __IAVF_RESETTING)

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

+8 −0
Original line number Diff line number Diff line
@@ -2226,6 +2226,14 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, 


		iavf_process_config(adapter);

		adapter->flags |= IAVF_FLAG_SETUP_NETDEV_FEATURES;



		/* Request VLAN offload settings */

		if (VLAN_V2_ALLOWED(adapter))

			iavf_set_vlan_offload_features(adapter, 0,

						       netdev->features);



		iavf_set_queue_vlan_tag_loc(adapter);



		was_mac_changed = !ether_addr_equal(netdev->dev_addr,

						    adapter->hw.mac.addr);