Commit 47251a36 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git 

/tnguy/net-queue

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-03-12

This series contains updates to ice, i40e, ixgbe and igb drivers.

Magnus adjusts the return value for xsk allocation for ice. This fixes
reporting of napi work done and matches the behavior of other Intel NIC
drivers for xsk allocations.

Maciej moves storing of the rx_offset value to after the build_skb flag
is set as this flag affects the offset value for ice, i40e, and ixgbe.

Li RongQing resolves an issue where an Rx buffer can be reused
prematurely with XDP redirect for igb.
====================
parents 6afa455e 98dfb02a

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

+13 −0
Original line number Diff line number Diff line
@@ -3258,6 +3258,17 @@ static int i40e_configure_tx_ring(struct i40e_ring *ring) 
	return 0;

}



/**

 * i40e_rx_offset - Return expected offset into page to access data

 * @rx_ring: Ring we are requesting offset of

 *

 * Returns the offset value for ring into the data buffer.

 */

static unsigned int i40e_rx_offset(struct i40e_ring *rx_ring)

{

	return ring_uses_build_skb(rx_ring) ? I40E_SKB_PAD : 0;

}



/**

 * i40e_configure_rx_ring - Configure a receive ring context

 * @ring: The Rx ring to configure
@@ -3369,6 +3380,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) 
	else

		set_ring_build_skb_enabled(ring);



	ring->rx_offset = i40e_rx_offset(ring);



	/* cache tail for quicker writes, and clear the reg before use */

	ring->tail = hw->hw_addr + I40E_QRX_TAIL(pf_q);

	writel(0, ring->tail);

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

+0 −12
Original line number Diff line number Diff line
@@ -1569,17 +1569,6 @@ void i40e_free_rx_resources(struct i40e_ring *rx_ring) 
	}

}



/**

 * i40e_rx_offset - Return expected offset into page to access data

 * @rx_ring: Ring we are requesting offset of

 *

 * Returns the offset value for ring into the data buffer.

 */

static unsigned int i40e_rx_offset(struct i40e_ring *rx_ring)

{

	return ring_uses_build_skb(rx_ring) ? I40E_SKB_PAD : 0;

}



/**

 * i40e_setup_rx_descriptors - Allocate Rx descriptors

 * @rx_ring: Rx descriptor ring (for a specific queue) to setup
@@ -1608,7 +1597,6 @@ int i40e_setup_rx_descriptors(struct i40e_ring *rx_ring) 
	rx_ring->next_to_alloc = 0;

	rx_ring->next_to_clean = 0;

	rx_ring->next_to_use = 0;

	rx_ring->rx_offset = i40e_rx_offset(rx_ring);



	/* XDP RX-queue info only needed for RX rings exposed to XDP */

	if (rx_ring->vsi->type == I40E_VSI_MAIN) {

drivers/net/ethernet/intel/ice/ice_base.c

+22 −2
Original line number Diff line number Diff line
@@ -274,6 +274,22 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) 
	tlan_ctx->legacy_int = ICE_TX_LEGACY;

}



/**

 * ice_rx_offset - Return expected offset into page to access data

 * @rx_ring: Ring we are requesting offset of

 *

 * Returns the offset value for ring into the data buffer.

 */

static unsigned int ice_rx_offset(struct ice_ring *rx_ring)

{

	if (ice_ring_uses_build_skb(rx_ring))

		return ICE_SKB_PAD;

	else if (ice_is_xdp_ena_vsi(rx_ring->vsi))

		return XDP_PACKET_HEADROOM;



	return 0;

}



/**

 * ice_setup_rx_ctx - Configure a receive ring context

 * @ring: The Rx ring to configure
@@ -413,11 +429,15 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	else

		ice_set_ring_build_skb_ena(ring);



	ring->rx_offset = ice_rx_offset(ring);



	/* init queue specific tail register */

	ring->tail = hw->hw_addr + QRX_TAIL(pf_q);

	writel(0, ring->tail);



	if (ring->xsk_pool) {

		bool ok;



		if (!xsk_buff_can_alloc(ring->xsk_pool, num_bufs)) {

			dev_warn(dev, "XSK buffer pool does not provide enough addresses to fill %d buffers on Rx ring %d\n",

				 num_bufs, ring->q_index);
@@ -426,8 +446,8 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
			return 0;

		}



		err = ice_alloc_rx_bufs_zc(ring, num_bufs);

		if (err)

		ok = ice_alloc_rx_bufs_zc(ring, num_bufs);

		if (!ok)

			dev_info(dev, "Failed to allocate some buffers on XSK buffer pool enabled Rx ring %d (pf_q %d)\n",

				 ring->q_index, pf_q);

		return 0;

drivers/net/ethernet/intel/ice/ice_txrx.c

+0 −17
Original line number Diff line number Diff line
@@ -443,22 +443,6 @@ void ice_free_rx_ring(struct ice_ring *rx_ring) 
	}

}



/**

 * ice_rx_offset - Return expected offset into page to access data

 * @rx_ring: Ring we are requesting offset of

 *

 * Returns the offset value for ring into the data buffer.

 */

static unsigned int ice_rx_offset(struct ice_ring *rx_ring)

{

	if (ice_ring_uses_build_skb(rx_ring))

		return ICE_SKB_PAD;

	else if (ice_is_xdp_ena_vsi(rx_ring->vsi))

		return XDP_PACKET_HEADROOM;



	return 0;

}



/**

 * ice_setup_rx_ring - Allocate the Rx descriptors

 * @rx_ring: the Rx ring to set up
@@ -493,7 +477,6 @@ int ice_setup_rx_ring(struct ice_ring *rx_ring) 


	rx_ring->next_to_use = 0;

	rx_ring->next_to_clean = 0;

	rx_ring->rx_offset = ice_rx_offset(rx_ring);



	if (ice_is_xdp_ena_vsi(rx_ring->vsi))

		WRITE_ONCE(rx_ring->xdp_prog, rx_ring->vsi->xdp_prog);

drivers/net/ethernet/intel/ice/ice_xsk.c

+5 −5
Original line number Diff line number Diff line
@@ -358,18 +358,18 @@ int ice_xsk_pool_setup(struct ice_vsi *vsi, struct xsk_buff_pool *pool, u16 qid) 
 * This function allocates a number of Rx buffers from the fill ring

 * or the internal recycle mechanism and places them on the Rx ring.

 *

 * Returns false if all allocations were successful, true if any fail.

 * Returns true if all allocations were successful, false if any fail.

 */

bool ice_alloc_rx_bufs_zc(struct ice_ring *rx_ring, u16 count)

{

	union ice_32b_rx_flex_desc *rx_desc;

	u16 ntu = rx_ring->next_to_use;

	struct ice_rx_buf *rx_buf;

	bool ret = false;

	bool ok = true;

	dma_addr_t dma;



	if (!count)

		return false;

		return true;



	rx_desc = ICE_RX_DESC(rx_ring, ntu);

	rx_buf = &rx_ring->rx_buf[ntu];
@@ -377,7 +377,7 @@ bool ice_alloc_rx_bufs_zc(struct ice_ring *rx_ring, u16 count) 
	do {

		rx_buf->xdp = xsk_buff_alloc(rx_ring->xsk_pool);

		if (!rx_buf->xdp) {

			ret = true;

			ok = false;

			break;

		}
@@ -402,7 +402,7 @@ bool ice_alloc_rx_bufs_zc(struct ice_ring *rx_ring, u16 count) 
		ice_release_rx_desc(rx_ring, ntu);

	}



	return ret;

	return ok;

}



/**