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

Commit 209dc4da authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40evf: allow channel bonding of VFs 



In some modes, bonding would not enslave VF interfaces. This is due to
bonding calling change_mtu and the immediately calling open. Because of
the asynchronous nature of the admin queue mechanism, the VF returns
-EBUSY to the open call, because it knows the previous operation hasn't
finished yet. This causes bonding to fail with a less-than-useful error
message.

To fix this, remove the check for pending operations at the beginning of
open. But this introduces a new bug where the driver will panic on a
quick close/open cycle. To fix that, we add a new driver state,
__I40EVF_DOWN_PENDING, that the driver enters when down is called. The
driver finally transitions to a fully DOWN state when it receives
confirmation from the PF driver that all the queues are disabled. This
allows open to complete even if there is a pending mtu change, and
bonding is finally happy.

Change-ID: I06f4c7e435d5bacbfceaa7c3f209e0ff04be21cc
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 48b1804e

drivers/net/ethernet/intel/i40evf/i40evf.h

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ enum i40evf_state_t { 
	__I40EVF_RESETTING,		/* in reset */

	/* Below here, watchdog is running */

	__I40EVF_DOWN,			/* ready, can be opened */

	__I40EVF_DOWN_PENDING,		/* descending, waiting for watchdog */

	__I40EVF_TESTING,		/* in ethtool self-test */

	__I40EVF_RUNNING,		/* opened, working */

};

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

+5 −4
Original line number Diff line number Diff line
@@ -1032,7 +1032,7 @@ void i40evf_down(struct i40evf_adapter *adapter) 
	struct net_device *netdev = adapter->netdev;

	struct i40evf_mac_filter *f;



	if (adapter->state == __I40EVF_DOWN)

	if (adapter->state <= __I40EVF_DOWN_PENDING)

		return;



	while (test_and_set_bit(__I40EVF_IN_CRITICAL_TASK,
@@ -2142,7 +2142,8 @@ static int i40evf_open(struct net_device *netdev) 
		dev_err(&adapter->pdev->dev, "Unable to open device due to PF driver failure.\n");

		return -EIO;

	}

	if (adapter->state != __I40EVF_DOWN || adapter->aq_required)



	if (adapter->state != __I40EVF_DOWN)

		return -EBUSY;



	/* allocate transmit descriptors */
@@ -2197,14 +2198,14 @@ static int i40evf_close(struct net_device *netdev) 
{

	struct i40evf_adapter *adapter = netdev_priv(netdev);



	if (adapter->state <= __I40EVF_DOWN)

	if (adapter->state <= __I40EVF_DOWN_PENDING)

		return 0;





	set_bit(__I40E_DOWN, &adapter->vsi.state);



	i40evf_down(adapter);

	adapter->state = __I40EVF_DOWN;

	adapter->state = __I40EVF_DOWN_PENDING;

	i40evf_free_traffic_irqs(adapter);



	return 0;

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

+2 −0
Original line number Diff line number Diff line
@@ -804,6 +804,8 @@ void i40evf_virtchnl_completion(struct i40evf_adapter *adapter, 
	case I40E_VIRTCHNL_OP_DISABLE_QUEUES:

		i40evf_free_all_tx_resources(adapter);

		i40evf_free_all_rx_resources(adapter);

		if (adapter->state == __I40EVF_DOWN_PENDING)

			adapter->state = __I40EVF_DOWN;

		break;

	case I40E_VIRTCHNL_OP_VERSION:

	case I40E_VIRTCHNL_OP_CONFIG_IRQ_MAP: