Commit 7237f5b0 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Jeff Kirsher
Browse files

ice: introduce legacy Rx flag 



Add an ethtool "legacy-rx" priv flag for toggling the Rx path. This
control knob will be mainly used for build_skb usage as well as buffer
size/MTU manipulation.

In preparation for adding build_skb support in a way that it takes
care of how we set the values of max_frame and rx_buf_len fields of
struct ice_vsi. Specifically, in this patch mentioned fields are set to
values that will allow us to provide headroom and tailroom in-place.

This can be mostly broken down onto following:
- for legacy-rx "on" ethtool control knob, old behaviour is kept;
- for standard 1500 MTU size configure the buffer of size 1536, as
  network stack is expecting the NET_SKB_PAD to be provided and
  NET_IP_ALIGN can have a non-zero value (these can be typically equal
  to 32 and 2, respectively);
- for larger MTUs go with max_frame set to 9k and configure the 3k
  buffer in case when PAGE_SIZE of underlying arch is less than 8k; 3k
  buffer is implying the need for order 1 page, so that our page
  recycling scheme can still be applied;

With that said, substitute the hardcoded ICE_RXBUF_2048 and PAGE_SIZE
values in DMA API that we're making use of with rx_ring->rx_buf_len and
ice_rx_pg_size(rx_ring). The latter is an introduced helper for
determining the page size based on its order (which was figured out via
ice_rx_pg_order). Last but not least, take care of truesize calculation.

In the followup patch the headroom/tailroom computation logic will be
introduced.

This change aligns the buffer and frame configuration with other Intel
drivers, most importantly with iavf.

Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2d4238f5

drivers/net/ethernet/intel/ice/ice.h

+1 −0
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ enum ice_pf_flags { 
	ICE_FLAG_NO_MEDIA,

	ICE_FLAG_FW_LLDP_AGENT,

	ICE_FLAG_ETHTOOL_CTXT,		/* set when ethtool holds RTNL lock */

	ICE_FLAG_LEGACY_RX,

	ICE_PF_FLAGS_NBITS		/* must be last */

};

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

+6 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ struct ice_priv_flag { 
static const struct ice_priv_flag ice_gstrings_priv_flags[] = {

	ICE_PRIV_FLAG("link-down-on-close", ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA),

	ICE_PRIV_FLAG("fw-lldp-agent", ICE_FLAG_FW_LLDP_AGENT),

	ICE_PRIV_FLAG("legacy-rx", ICE_FLAG_LEGACY_RX),

};



#define ICE_PRIV_FLAG_ARRAY_SIZE	ARRAY_SIZE(ice_gstrings_priv_flags)
@@ -1256,6 +1257,11 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags) 
					"Fail to enable MIB change events\n");

		}

	}

	if (test_bit(ICE_FLAG_LEGACY_RX, change_flags)) {

		/* down and up VSI so that changes of Rx cfg are reflected. */

		ice_down(vsi);

		ice_up(vsi);

	}

	clear_bit(ICE_FLAG_ETHTOOL_CTXT, pf->flags);

	return ret;

}

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

+16 −6
Original line number Diff line number Diff line
@@ -1190,12 +1190,22 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid) 
 */

void ice_vsi_cfg_frame_size(struct ice_vsi *vsi)

{

	if (vsi->netdev && vsi->netdev->mtu > ETH_DATA_LEN)

		vsi->max_frame = vsi->netdev->mtu + ICE_ETH_PKT_HDR_PAD;

	else

		vsi->max_frame = ICE_RXBUF_2048;



	if (!vsi->netdev || test_bit(ICE_FLAG_LEGACY_RX, vsi->back->flags)) {

		vsi->max_frame = ICE_AQ_SET_MAC_FRAME_SIZE_MAX;

		vsi->rx_buf_len = ICE_RXBUF_2048;

#if (PAGE_SIZE < 8192)

	} else if (vsi->netdev->mtu <= ETH_DATA_LEN) {

		vsi->max_frame = ICE_RXBUF_1536 - NET_IP_ALIGN;

		vsi->rx_buf_len = ICE_RXBUF_1536 - NET_IP_ALIGN;

#endif

	} else {

		vsi->max_frame = ICE_AQ_SET_MAC_FRAME_SIZE_MAX;

#if (PAGE_SIZE < 8192)

		vsi->rx_buf_len = ICE_RXBUF_3072;

#else

		vsi->rx_buf_len = ICE_RXBUF_2048;

#endif

	}

}



/**

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

+27 −19
Original line number Diff line number Diff line
@@ -310,10 +310,11 @@ void ice_clean_rx_ring(struct ice_ring *rx_ring) 
		 */

		dma_sync_single_range_for_cpu(dev, rx_buf->dma,

					      rx_buf->page_offset,

					      ICE_RXBUF_2048, DMA_FROM_DEVICE);

					      rx_ring->rx_buf_len,

					      DMA_FROM_DEVICE);



		/* free resources associated with mapping */

		dma_unmap_page_attrs(dev, rx_buf->dma, PAGE_SIZE,

		dma_unmap_page_attrs(dev, rx_buf->dma, ice_rx_pg_size(rx_ring),

				     DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);

		__page_frag_cache_drain(rx_buf->page, rx_buf->pagecnt_bias);
@@ -529,21 +530,21 @@ ice_alloc_mapped_page(struct ice_ring *rx_ring, struct ice_rx_buf *bi) 
	}



	/* alloc new page for storage */

	page = alloc_page(GFP_ATOMIC | __GFP_NOWARN);

	page = dev_alloc_pages(ice_rx_pg_order(rx_ring));

	if (unlikely(!page)) {

		rx_ring->rx_stats.alloc_page_failed++;

		return false;

	}



	/* map page for use */

	dma = dma_map_page_attrs(rx_ring->dev, page, 0, PAGE_SIZE,

	dma = dma_map_page_attrs(rx_ring->dev, page, 0, ice_rx_pg_size(rx_ring),

				 DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);



	/* if mapping failed free memory back to system since

	 * there isn't much point in holding memory we can't use

	 */

	if (dma_mapping_error(rx_ring->dev, dma)) {

		__free_pages(page, 0);

		__free_pages(page, ice_rx_pg_order(rx_ring));

		rx_ring->rx_stats.alloc_page_failed++;

		return false;

	}
@@ -592,7 +593,7 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count) 
		/* sync the buffer for use by the device */

		dma_sync_single_range_for_device(rx_ring->dev, bi->dma,

						 bi->page_offset,

						 ICE_RXBUF_2048,

						 rx_ring->rx_buf_len,

						 DMA_FROM_DEVICE);



		/* Refresh the desc even if buffer_addrs didn't change
@@ -663,9 +664,6 @@ ice_rx_buf_adjust_pg_offset(struct ice_rx_buf *rx_buf, unsigned int size) 
 */

static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf)

{

#if (PAGE_SIZE >= 8192)

	unsigned int last_offset = PAGE_SIZE - ICE_RXBUF_2048;

#endif

	unsigned int pagecnt_bias = rx_buf->pagecnt_bias;

	struct page *page = rx_buf->page;
@@ -678,7 +676,9 @@ static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf) 
	if (unlikely((page_count(page) - pagecnt_bias) > 1))

		return false;

#else

	if (rx_buf->page_offset > last_offset)

#define ICE_LAST_OFFSET \

	(SKB_WITH_OVERHEAD(PAGE_SIZE) - ICE_RXBUF_2048)

	if (rx_buf->page_offset > ICE_LAST_OFFSET)

		return false;

#endif /* PAGE_SIZE < 8192) */
@@ -696,6 +696,7 @@ static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf) 


/**

 * ice_add_rx_frag - Add contents of Rx buffer to sk_buff as a frag

 * @rx_ring: Rx descriptor ring to transact packets on

 * @rx_buf: buffer containing page to add

 * @skb: sk_buff to place the data into

 * @size: packet length from rx_desc
@@ -705,13 +706,13 @@ static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf) 
 * The function will then update the page offset.

 */

static void

ice_add_rx_frag(struct ice_rx_buf *rx_buf, struct sk_buff *skb,

		unsigned int size)

ice_add_rx_frag(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf,

		struct sk_buff *skb, unsigned int size)

{

#if (PAGE_SIZE >= 8192)

	unsigned int truesize = SKB_DATA_ALIGN(size);

#else

	unsigned int truesize = ICE_RXBUF_2048;

	unsigned int truesize = ice_rx_pg_size(rx_ring) / 2;

#endif



	if (!size)
@@ -830,7 +831,7 @@ ice_construct_skb(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf, 
#if (PAGE_SIZE >= 8192)

		unsigned int truesize = SKB_DATA_ALIGN(size);

#else

		unsigned int truesize = ICE_RXBUF_2048;

		unsigned int truesize = ice_rx_pg_size(rx_ring) / 2;

#endif

		skb_add_rx_frag(skb, 0, rx_buf->page,

				rx_buf->page_offset + headlen, size, truesize);
@@ -873,8 +874,9 @@ static void ice_put_rx_buf(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf) 
		rx_ring->rx_stats.page_reuse_count++;

	} else {

		/* we are not reusing the buffer so unmap it */

		dma_unmap_page_attrs(rx_ring->dev, rx_buf->dma, PAGE_SIZE,

				     DMA_FROM_DEVICE, ICE_RX_DMA_ATTR);

		dma_unmap_page_attrs(rx_ring->dev, rx_buf->dma,

				     ice_rx_pg_size(rx_ring), DMA_FROM_DEVICE,

				     ICE_RX_DMA_ATTR);

		__page_frag_cache_drain(rx_buf->page, rx_buf->pagecnt_bias);

	}
@@ -1008,9 +1010,15 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget) 
		rcu_read_unlock();

		if (xdp_res) {

			if (xdp_res & (ICE_XDP_TX | ICE_XDP_REDIR)) {

				unsigned int truesize;



#if (PAGE_SIZE < 8192)

				truesize = ice_rx_pg_size(rx_ring) / 2;

#else

				truesize = SKB_DATA_ALIGN(size);

#endif

				xdp_xmit |= xdp_res;

				ice_rx_buf_adjust_pg_offset(rx_buf,

							    ICE_RXBUF_2048);

				ice_rx_buf_adjust_pg_offset(rx_buf, truesize);

			} else {

				rx_buf->pagecnt_bias++;

			}
@@ -1023,7 +1031,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget) 
		}

construct_skb:

		if (skb)

			ice_add_rx_frag(rx_buf, skb, size);

			ice_add_rx_frag(rx_ring, rx_buf, skb, size);

		else

			skb = ice_construct_skb(rx_ring, rx_buf, &xdp);

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

+13 −0
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ 
#include "ice_type.h"



#define ICE_DFLT_IRQ_WORK	256

#define ICE_RXBUF_3072		3072

#define ICE_RXBUF_2048		2048

#define ICE_RXBUF_1536		1536

#define ICE_MAX_CHAINED_RX_BUFS	5

#define ICE_MAX_BUF_TXD		8

#define ICE_MIN_TX_LEN		17
@@ -262,6 +264,17 @@ struct ice_ring_container { 
#define ice_for_each_ring(pos, head) \

	for (pos = (head).ring; pos; pos = pos->next)



static inline unsigned int ice_rx_pg_order(struct ice_ring *ring)

{

#if (PAGE_SIZE < 8192)

	if (ring->rx_buf_len > (PAGE_SIZE / 2))

		return 1;

#endif

	return 0;

}



#define ice_rx_pg_size(_ring) (PAGE_SIZE << ice_rx_pg_order(_ring))



union ice_32b_rx_flex_desc;



bool ice_alloc_rx_bufs(struct ice_ring *rxr, u16 cleaned_count);

CRA Git | Maintained and supported by SUSTech CRA and CCSE