Commit 57d03f56 authored by Michal Maloszewski's avatar Michal Maloszewski Committed by Tony Nguyen
Browse files

iavf: Fix adopting new combined setting 



In some cases overloaded flag IAVF_FLAG_REINIT_ITR_NEEDED
which should indicate that interrupts need to be completely
reinitialized during reset leads to RTNL deadlocks using ethtool -C
while a reset is in progress.
To fix, it was added a new flag IAVF_FLAG_REINIT_MSIX_NEEDED
used to trigger MSI-X reinit.
New combined setting is fixed adopt after VF reset.
This has been implemented by call reinit interrupt scheme
during VF reset.
Without this fix new combined setting has never been adopted.

Fixes: 209f2f9c ("iavf: Add support for VIRTCHNL_VF_OFFLOAD_VLAN_V2 negotiation")
Signed-off-by: default avatarGrzegorz Szczurek <grzegorzx.szczurek@intel.com>
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Signed-off-by: default avatarMichal Maloszewski <michal.maloszewski@intel.com>
Tested-by: default avatarKonrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 2cf29e55

drivers/net/ethernet/intel/iavf/iavf.h

+1 −0
Original line number Diff line number Diff line
@@ -288,6 +288,7 @@ struct iavf_adapter { 
#define IAVF_FLAG_REINIT_ITR_NEEDED		BIT(16)

#define IAVF_FLAG_QUEUES_DISABLED		BIT(17)

#define IAVF_FLAG_SETUP_NETDEV_FEATURES		BIT(18)

#define IAVF_FLAG_REINIT_MSIX_NEEDED		BIT(20)

/* duplicates for common code */

#define IAVF_FLAG_DCB_ENABLED			0

	/* flags for admin queue service task */

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

+9 −4
Original line number Diff line number Diff line
@@ -2120,7 +2120,7 @@ int iavf_parse_vf_resource_msg(struct iavf_adapter *adapter) 
			"Requested %d queues, but PF only gave us %d.\n",

			num_req_queues,

			adapter->vsi_res->num_queue_pairs);

		adapter->flags |= IAVF_FLAG_REINIT_ITR_NEEDED;

		adapter->flags |= IAVF_FLAG_REINIT_MSIX_NEEDED;

		adapter->num_req_queues = adapter->vsi_res->num_queue_pairs;

		iavf_schedule_reset(adapter);
@@ -2727,7 +2727,8 @@ static void iavf_reset_task(struct work_struct *work) 
			 err);

	adapter->aq_required = 0;



	if (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED) {

	if ((adapter->flags & IAVF_FLAG_REINIT_MSIX_NEEDED) ||

	    (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED)) {

		err = iavf_reinit_interrupt_scheme(adapter);

		if (err)

			goto reset_err;
@@ -2799,12 +2800,13 @@ static void iavf_reset_task(struct work_struct *work) 
		if (err)

			goto reset_err;



		if (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED) {

		if ((adapter->flags & IAVF_FLAG_REINIT_MSIX_NEEDED) ||

		    (adapter->flags & IAVF_FLAG_REINIT_ITR_NEEDED)) {

			err = iavf_request_traffic_irqs(adapter, netdev->name);

			if (err)

				goto reset_err;



			adapter->flags &= ~IAVF_FLAG_REINIT_ITR_NEEDED;

			adapter->flags &= ~IAVF_FLAG_REINIT_MSIX_NEEDED;

		}



		iavf_configure(adapter);
@@ -2819,6 +2821,9 @@ static void iavf_reset_task(struct work_struct *work) 
		iavf_change_state(adapter, __IAVF_DOWN);

		wake_up(&adapter->down_waitqueue);

	}



	adapter->flags &= ~IAVF_FLAG_REINIT_ITR_NEEDED;



	mutex_unlock(&adapter->client_lock);

	mutex_unlock(&adapter->crit_lock);