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

Commit 1a557afc authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e: Refactor receive routine 



This is part 1 of the Rx refactor series, just including
changes to i40e.

This refactor aligns the receive routine with the one in
ixgbe which was highly optimized.  This reduces the code
we have to maintain and allows for (hopefully) more readable
and maintainable RX hot path.

In order to do this:
- consolidate the receive path into a single function that doesn't
  use packet split but *does* use pages for Rx buffers.
- remove the old _1buf routine
- consolidate several routines into helper functions
- remove ethtool control over packet split

Change-ID: I5ca100721de65992aa0114f8b4bac844b84758e0
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 04b3b779

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

+0 −1
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ struct i40e_vsi { 
	u8  *rss_lut_user;  /* User configured lookup table entries */



	u16 max_frame;

	u16 rx_hdr_len;

	u16 rx_buf_len;

	u8  dtype;

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

+4 −5
Original line number Diff line number Diff line
@@ -268,9 +268,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 rx_ring->queue_index,

			 rx_ring->reg_idx);

		dev_info(&pf->pdev->dev,

			 "    rx_rings[%i]: rx_hdr_len = %d, rx_buf_len = %d\n",

			 i, rx_ring->rx_hdr_len,

			 rx_ring->rx_buf_len);

			 "    rx_rings[%i]: rx_buf_len = %d\n",

			 i, rx_ring->rx_buf_len);

		dev_info(&pf->pdev->dev,

			 "    rx_rings[%i]: next_to_use = %d, next_to_clean = %d, ring_active = %i\n",

			 i,
@@ -361,8 +360,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
		 "    work_limit = %d\n",

		 vsi->work_limit);

	dev_info(&pf->pdev->dev,

		 "    max_frame = %d, rx_hdr_len = %d, rx_buf_len = %d dtype = %d\n",

		 vsi->max_frame, vsi->rx_hdr_len, vsi->rx_buf_len, vsi->dtype);

		 "    max_frame = %d, rx_buf_len = %d dtype = %d\n",

		 vsi->max_frame, vsi->rx_buf_len, vsi->dtype);

	dev_info(&pf->pdev->dev,

		 "    num_q_vectors = %i, base_vector = %i\n",

		 vsi->num_q_vectors, vsi->base_vector);

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

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ static const char i40e_priv_flags_strings[][ETH_GSTRING_LEN] = { 
	"LinkPolling",

	"flow-director-atr",

	"veb-stats",

	"packet-split",

	"hw-atr-eviction",

};

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

+4 −12
Original line number Diff line number Diff line
@@ -2855,10 +2855,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) 
	memset(&rx_ctx, 0, sizeof(rx_ctx));



	ring->rx_buf_len = vsi->rx_buf_len;

	ring->rx_hdr_len = vsi->rx_hdr_len;



	rx_ctx.dbuff = ring->rx_buf_len >> I40E_RXQ_CTX_DBUFF_SHIFT;

	rx_ctx.hbuff = ring->rx_hdr_len >> I40E_RXQ_CTX_HBUFF_SHIFT;



	rx_ctx.base = (ring->dma / 128);

	rx_ctx.qlen = ring->count;
@@ -2910,7 +2908,7 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) 
	ring->tail = hw->hw_addr + I40E_QRX_TAIL(pf_q);

	writel(0, ring->tail);



	i40e_alloc_rx_buffers_1buf(ring, I40E_DESC_UNUSED(ring));

	i40e_alloc_rx_buffers(ring, I40E_DESC_UNUSED(ring));



	return 0;

}
@@ -2949,15 +2947,13 @@ static int i40e_vsi_configure_rx(struct i40e_vsi *vsi) 
	else

		vsi->max_frame = I40E_RXBUFFER_2048;



	vsi->rx_hdr_len = 0;

	vsi->rx_buf_len = vsi->max_frame;

	vsi->rx_buf_len = I40E_RXBUFFER_2048;

	vsi->dtype = I40E_RX_DTYPE_NO_SPLIT;



#ifdef I40E_FCOE

	/* setup rx buffer for FCoE */

	if ((vsi->type == I40E_VSI_FCOE) &&

	    (vsi->back->flags & I40E_FLAG_FCOE_ENABLED)) {

		vsi->rx_hdr_len = 0;

		vsi->rx_buf_len = I40E_RXBUFFER_3072;

		vsi->max_frame = I40E_RXBUFFER_3072;

		vsi->dtype = I40E_RX_DTYPE_NO_SPLIT;
@@ -2965,8 +2961,6 @@ static int i40e_vsi_configure_rx(struct i40e_vsi *vsi) 


#endif /* I40E_FCOE */

	/* round up for the chip's needs */

	vsi->rx_hdr_len = ALIGN(vsi->rx_hdr_len,

				BIT_ULL(I40E_RXQ_CTX_HBUFF_SHIFT));

	vsi->rx_buf_len = ALIGN(vsi->rx_buf_len,

				BIT_ULL(I40E_RXQ_CTX_DBUFF_SHIFT));
@@ -10661,11 +10655,9 @@ static void i40e_print_features(struct i40e_pf *pf) 
#ifdef CONFIG_PCI_IOV

	i += snprintf(&buf[i], REMAIN(i), " VFs: %d", pf->num_req_vfs);

#endif

	i += snprintf(&buf[i], REMAIN(i), " VSIs: %d QP: %d RX: %s",

	i += snprintf(&buf[i], REMAIN(i), " VSIs: %d QP: %d",

		      pf->hw.func_caps.num_vsis,

		      pf->vsi[pf->lan_vsi]->num_queue_pairs,

		      "1BUF");



		      pf->vsi[pf->lan_vsi]->num_queue_pairs);

	if (pf->flags & I40E_FLAG_RSS_ENABLED)

		i += snprintf(&buf[i], REMAIN(i), " RSS");

	if (pf->flags & I40E_FLAG_FD_ATR_ENABLED)

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

+498 −272

File changed.

Preview size limit exceeded, changes collapsed.