Commit 71f9b61c authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2018-09-25

This series contains updates to i40e and xsk.

Mariusz fixes an issue where the VF link state was not being updated
properly when the PF is down or up.  Also cleaned up the promiscuous
configuration during a VF reset.

Patryk simplifies the code a bit to use the variables for PF and HW that
are declared, rather than using the VSI pointers.  Cleaned up the
message length parameter to several virtchnl functions, since it was not
being used (or needed).

Harshitha fixes two potential race conditions when trying to change VF
settings by creating a helper function to validate that the VF is
enabled and that the VSI is set up.

Sergey corrects a double "link down" message by putting in a check for
whether or not the link is up or going down.

Björn addresses an AF_XDP zero-copy issue that buffers passed
from userspace to the kernel was leaked when the hardware descriptor
ring was torn down.  A zero-copy capable driver picks buffers off the
fill ring and places them on the hardware receive ring to be completed at
a later point when DMA is complete. Similar on the transmit side; The
driver picks buffers off the transmit ring and places them on the
transmit hardware ring.

In the typical flow, the receive buffer will be placed onto an receive
ring (completed to the user), and the transmit buffer will be placed on
the completion ring to notify the user that the transfer is done.

However, if the driver needs to tear down the hardware rings for some
reason (interface goes down, reconfiguration and such), the userspace
buffers cannot be leaked. They have to be reused or completed back to
userspace.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7a153655 3ab52af5

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

+8 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include "i40e.h"

#include "i40e_diag.h"

#include "i40e_txrx_common.h"



/* ethtool statistics helpers */
@@ -1710,6 +1711,13 @@ static int i40e_set_ringparam(struct net_device *netdev, 
	    (new_rx_count == vsi->rx_rings[0]->count))

		return 0;



	/* If there is a AF_XDP UMEM attached to any of Rx rings,

	 * disallow changing the number of descriptors -- regardless

	 * if the netdev is running or not.

	 */

	if (i40e_xsk_any_rx_ring_enabled(vsi))

		return -EBUSY;



	while (test_and_set_bit(__I40E_CONFIG_BUSY, pf->state)) {

		timeout--;

		if (!timeout)

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

+8 −11
Original line number Diff line number Diff line
@@ -1532,8 +1532,8 @@ static int i40e_set_mac(struct net_device *netdev, void *p) 
		return 0;

	}



	if (test_bit(__I40E_VSI_DOWN, vsi->back->state) ||

	    test_bit(__I40E_RESET_RECOVERY_PENDING, vsi->back->state))

	if (test_bit(__I40E_DOWN, pf->state) ||

	    test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state))

		return -EADDRNOTAVAIL;



	if (ether_addr_equal(hw->mac.addr, addr->sa_data))
@@ -1557,8 +1557,7 @@ static int i40e_set_mac(struct net_device *netdev, void *p) 
	if (vsi->type == I40E_VSI_MAIN) {

		i40e_status ret;



		ret = i40e_aq_mac_address_write(&vsi->back->hw,

						I40E_AQC_WRITE_TYPE_LAA_WOL,

		ret = i40e_aq_mac_address_write(hw, I40E_AQC_WRITE_TYPE_LAA_WOL,

						addr->sa_data, NULL);

		if (ret)

			netdev_info(netdev, "Ignoring error from firmware on LAA update, status %s, AQ ret %s\n",
@@ -1569,7 +1568,7 @@ static int i40e_set_mac(struct net_device *netdev, void *p) 
	/* schedule our worker thread which will take care of

	 * applying the new filter changes

	 */

	i40e_service_event_schedule(vsi->back);

	i40e_service_event_schedule(pf);

	return 0;

}
@@ -6432,7 +6431,10 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) 
	char *req_fec = "";

	char *an = "";



	if (isup)

		new_speed = pf->hw.phy.link_info.link_speed;

	else

		new_speed = I40E_LINK_SPEED_UNKNOWN;



	if ((vsi->current_isup == isup) && (vsi->current_speed == new_speed))

		return;
@@ -8509,14 +8511,9 @@ static void i40e_link_event(struct i40e_pf *pf) 
	i40e_status status;

	bool new_link, old_link;



	/* save off old link status information */

	pf->hw.phy.link_info_old = pf->hw.phy.link_info;



	/* set this to force the get_link_status call to refresh state */

	pf->hw.phy.get_link_info = true;



	old_link = (pf->hw.phy.link_info_old.link_info & I40E_AQ_LINK_UP);



	status = i40e_get_link_status(&pf->hw, &new_link);



	/* On success, disable temp link polling */

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

+14 −7
Original line number Diff line number Diff line
@@ -636,13 +636,18 @@ void i40e_clean_tx_ring(struct i40e_ring *tx_ring) 
	unsigned long bi_size;

	u16 i;



	if (ring_is_xdp(tx_ring) && tx_ring->xsk_umem) {

		i40e_xsk_clean_tx_ring(tx_ring);

	} else {

		/* ring already cleared, nothing to do */

		if (!tx_ring->tx_bi)

			return;



		/* Free all the Tx ring sk_buffs */

		for (i = 0; i < tx_ring->count; i++)

		i40e_unmap_and_free_tx_resource(tx_ring, &tx_ring->tx_bi[i]);

			i40e_unmap_and_free_tx_resource(tx_ring,

							&tx_ring->tx_bi[i]);

	}



	bi_size = sizeof(struct i40e_tx_buffer) * tx_ring->count;

	memset(tx_ring->tx_bi, 0, bi_size);
@@ -1350,8 +1355,10 @@ void i40e_clean_rx_ring(struct i40e_ring *rx_ring) 
		rx_ring->skb = NULL;

	}



	if (rx_ring->xsk_umem)

	if (rx_ring->xsk_umem) {

		i40e_xsk_clean_rx_ring(rx_ring);

		goto skip_free;

	}



	/* Free all the Rx ring sk_buffs */

	for (i = 0; i < rx_ring->count; i++) {

drivers/net/ethernet/intel/i40e/i40e_txrx_common.h

+4 −0
Original line number Diff line number Diff line
@@ -87,4 +87,8 @@ static inline void i40e_arm_wb(struct i40e_ring *tx_ring, 
	}

}



void i40e_xsk_clean_rx_ring(struct i40e_ring *rx_ring);

void i40e_xsk_clean_tx_ring(struct i40e_ring *tx_ring);

bool i40e_xsk_any_rx_ring_enabled(struct i40e_vsi *vsi);



#endif /* I40E_TXRX_COMMON_ */

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

+235 −190

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE