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

Commit 43ae93a9 authored by Mitch Williams's avatar Mitch Williams Committed by David S. Miller
Browse files

i40e/i40evf: check for stopped admin queue 



It's possible that while we are waiting for the spinlock, another
entity (that owns the spinlock) has shut down the admin queue.
If we then attempt to use the queue, we will panic.

Add a check for this condition on the receive side. This matches
an existing check on the send queue side.

Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4bbac39

drivers/net/ethernet/intel/i40e/i40e_adminq.c

+9 −0
Original line number Diff line number Diff line
@@ -946,6 +946,13 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw, 
	/* take the lock before we start messing with the ring */

	mutex_lock(&hw->aq.arq_mutex);



	if (hw->aq.arq.count == 0) {

		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,

			   "AQRX: Admin queue not initialized.\n");

		ret_code = I40E_ERR_QUEUE_EMPTY;

		goto clean_arq_element_err;

	}



	/* set next_to_use to head */

	ntu = (rd32(hw, hw->aq.arq.head) & I40E_PF_ARQH_ARQH_MASK);

	if (ntu == ntc) {
@@ -1007,6 +1014,8 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw, 
	/* Set pending if needed, unlock and return */

	if (pending != NULL)

		*pending = (ntc > ntu ? hw->aq.arq.count : 0) + (ntu - ntc);



clean_arq_element_err:

	mutex_unlock(&hw->aq.arq_mutex);



	if (i40e_is_nvm_update_op(&e->desc)) {

drivers/net/ethernet/intel/i40evf/i40e_adminq.c

+9 −0
Original line number Diff line number Diff line
@@ -887,6 +887,13 @@ i40e_status i40evf_clean_arq_element(struct i40e_hw *hw, 
	/* take the lock before we start messing with the ring */

	mutex_lock(&hw->aq.arq_mutex);



	if (hw->aq.arq.count == 0) {

		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,

			   "AQRX: Admin queue not initialized.\n");

		ret_code = I40E_ERR_QUEUE_EMPTY;

		goto clean_arq_element_err;

	}



	/* set next_to_use to head */

	ntu = (rd32(hw, hw->aq.arq.head) & I40E_VF_ARQH1_ARQH_MASK);

	if (ntu == ntc) {
@@ -948,6 +955,8 @@ i40e_status i40evf_clean_arq_element(struct i40e_hw *hw, 
	/* Set pending if needed, unlock and return */

	if (pending != NULL)

		*pending = (ntc > ntu ? hw->aq.arq.count : 0) + (ntu - ntc);



clean_arq_element_err:

	mutex_unlock(&hw->aq.arq_mutex);



	return ret_code;