Commit ae806c78 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-08-12 (iavf)

This series contains updates to iavf driver only.

Przemyslaw frees memory for admin queues in initialization error paths,
prevents freeing of vf_res which is causing null pointer dereference,
and adjusts calls in error path of reset to avoid iavf_close() which
could cause deadlock.

Ivan Vecera avoids deadlock that can occur when driver if part of
failover.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  iavf: Fix deadlock in initialization
  iavf: Fix reset error handling
  iavf: Fix NULL pointer dereference in iavf_get_link_ksettings
  iavf: Fix adminq error handling
====================

Link: https://lore.kernel.org/r/20220812172309.853230-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5b22f627 cbe9e511

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

+13 −2
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ static enum iavf_status iavf_config_arq_regs(struct iavf_hw *hw) 
static enum iavf_status iavf_init_asq(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;

	int i;



	if (hw->aq.asq.count > 0) {

		/* queue already initialized */
@@ -354,12 +355,17 @@ static enum iavf_status iavf_init_asq(struct iavf_hw *hw) 
	/* initialize base registers */

	ret_code = iavf_config_asq_regs(hw);

	if (ret_code)

		goto init_adminq_free_rings;

		goto init_free_asq_bufs;



	/* success! */

	hw->aq.asq.count = hw->aq.num_asq_entries;

	goto init_adminq_exit;



init_free_asq_bufs:

	for (i = 0; i < hw->aq.num_asq_entries; i++)

		iavf_free_dma_mem(hw, &hw->aq.asq.r.asq_bi[i]);

	iavf_free_virt_mem(hw, &hw->aq.asq.dma_head);



init_adminq_free_rings:

	iavf_free_adminq_asq(hw);
@@ -383,6 +389,7 @@ static enum iavf_status iavf_init_asq(struct iavf_hw *hw) 
static enum iavf_status iavf_init_arq(struct iavf_hw *hw)

{

	enum iavf_status ret_code = 0;

	int i;



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

		/* queue already initialized */
@@ -413,12 +420,16 @@ static enum iavf_status iavf_init_arq(struct iavf_hw *hw) 
	/* initialize base registers */

	ret_code = iavf_config_arq_regs(hw);

	if (ret_code)

		goto init_adminq_free_rings;

		goto init_free_arq_bufs;



	/* success! */

	hw->aq.arq.count = hw->aq.num_arq_entries;

	goto init_adminq_exit;



init_free_arq_bufs:

	for (i = 0; i < hw->aq.num_arq_entries; i++)

		iavf_free_dma_mem(hw, &hw->aq.arq.r.arq_bi[i]);

	iavf_free_virt_mem(hw, &hw->aq.arq.dma_head);

init_adminq_free_rings:

	iavf_free_adminq_arq(hw);

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

+17 −5
Original line number Diff line number Diff line
@@ -2367,7 +2367,7 @@ static void iavf_init_get_resources(struct iavf_adapter *adapter) 
	err = iavf_get_vf_config(adapter);

	if (err == -EALREADY) {

		err = iavf_send_vf_config_msg(adapter);

		goto err_alloc;

		goto err;

	} else if (err == -EINVAL) {

		/* We only get -EINVAL if the device is in a very bad

		 * state or if we've been disabled for previous bad
@@ -3086,12 +3086,15 @@ static void iavf_reset_task(struct work_struct *work) 


	return;

reset_err:

	if (running) {

		set_bit(__IAVF_VSI_DOWN, adapter->vsi.state);

		iavf_free_traffic_irqs(adapter);

	}

	iavf_disable_vf(adapter);



	mutex_unlock(&adapter->client_lock);

	mutex_unlock(&adapter->crit_lock);

	if (running)

		iavf_change_state(adapter, __IAVF_RUNNING);

	dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");

	iavf_close(netdev);

}



/**
@@ -4085,8 +4088,17 @@ static int iavf_open(struct net_device *netdev) 
		return -EIO;

	}



	while (!mutex_trylock(&adapter->crit_lock))

	while (!mutex_trylock(&adapter->crit_lock)) {

		/* If we are in __IAVF_INIT_CONFIG_ADAPTER state the crit_lock

		 * is already taken and iavf_open is called from an upper

		 * device's notifier reacting on NETDEV_REGISTER event.

		 * We have to leave here to avoid dead lock.

		 */

		if (adapter->state == __IAVF_INIT_CONFIG_ADAPTER)

			return -EBUSY;



		usleep_range(500, 1000);

	}



	if (adapter->state != __IAVF_DOWN) {

		err = -EBUSY;