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

Commit dab86afd authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

i40e/i40evf: Change the way we limit the maximum frame size for Rx 



This patch changes the way we handle the maximum frame size for the Rx
path.  Previously we were rounding up to 2K for a 1500 MTU and then brining
the max frame size down to MTU plus a fixed amount.  With this patch
applied what we now do is limit the maximum frame to 1.5K minus the value
for NET_IP_ALIGN for standard MTU, and for any MTU greater than 1500 we
allow up to the maximum frame size.  This makes the behavior more
consistent with the other drivers such as igb which had similar logic.  In
addition it reduces the test matrix for MTU since we only have two max
frame sizes that are handled for Rx now.

Change-ID: I23a9d3c857e7df04b0ef28c64df63e659c013f3f
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c424d4a3

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

+14 −12
Original line number Diff line number Diff line
@@ -2995,7 +2995,8 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring) 


	ring->rx_buf_len = vsi->rx_buf_len;



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

	rx_ctx.dbuff = DIV_ROUND_UP(ring->rx_buf_len,

				    BIT_ULL(I40E_RXQ_CTX_DBUFF_SHIFT));



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

	rx_ctx.qlen = ring->count;
@@ -3075,17 +3076,18 @@ static int i40e_vsi_configure_rx(struct i40e_vsi *vsi) 
	int err = 0;

	u16 i;



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

		vsi->max_frame = vsi->netdev->mtu + ETH_HLEN

			       + ETH_FCS_LEN + VLAN_HLEN;

	else

		vsi->max_frame = I40E_RXBUFFER_2048;



	if (!vsi->netdev || (vsi->back->flags & I40E_FLAG_LEGACY_RX)) {

		vsi->max_frame = I40E_MAX_RXBUFFER;

		vsi->rx_buf_len = I40E_RXBUFFER_2048;



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

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

				BIT_ULL(I40E_RXQ_CTX_DBUFF_SHIFT));

#if (PAGE_SIZE < 8192)

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

		vsi->max_frame = I40E_RXBUFFER_1536 - NET_IP_ALIGN;

		vsi->rx_buf_len = I40E_RXBUFFER_1536 - NET_IP_ALIGN;

#endif

	} else {

		vsi->max_frame = I40E_MAX_RXBUFFER;

		vsi->rx_buf_len = I40E_RXBUFFER_2048;

	}



	/* set up individual rings */

	for (i = 0; i < vsi->num_queue_pairs && !err; i++)

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

+1 −3
Original line number Diff line number Diff line
@@ -117,10 +117,8 @@ enum i40e_dyn_idx_t { 


/* Supported Rx Buffer Sizes (a multiple of 128) */

#define I40E_RXBUFFER_256   256

#define I40E_RXBUFFER_1536  1536  /* 128B aligned standard Ethernet frame */

#define I40E_RXBUFFER_2048  2048

#define I40E_RXBUFFER_3072  3072   /* For FCoE MTU of 2158 */

#define I40E_RXBUFFER_4096  4096

#define I40E_RXBUFFER_8192  8192

#define I40E_MAX_RXBUFFER   9728  /* largest size for single descriptor */



/* NOTE: netdev_alloc_skb reserves up to 64 bytes, NET_IP_ALIGN means we

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

+1 −3
Original line number Diff line number Diff line
@@ -104,10 +104,8 @@ enum i40e_dyn_idx_t { 


/* Supported Rx Buffer Sizes (a multiple of 128) */

#define I40E_RXBUFFER_256   256

#define I40E_RXBUFFER_1536  1536  /* 128B aligned standard Ethernet frame */

#define I40E_RXBUFFER_2048  2048

#define I40E_RXBUFFER_3072  3072   /* For FCoE MTU of 2158 */

#define I40E_RXBUFFER_4096  4096

#define I40E_RXBUFFER_8192  8192

#define I40E_MAX_RXBUFFER   9728  /* largest size for single descriptor */



/* NOTE: netdev_alloc_skb reserves up to 64 bytes, NET_IP_ALIGN means we

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

+0 −4
Original line number Diff line number Diff line
@@ -72,10 +72,6 @@ struct i40e_vsi { 
#define I40EVF_MAX_RXD		4096

#define I40EVF_MIN_RXD		64

#define I40EVF_REQ_DESCRIPTOR_MULTIPLE	32



/* Supported Rx Buffer Sizes */

#define I40EVF_RXBUFFER_2048	2048

#define I40EVF_MAX_RXBUFFER	16384  /* largest size for single descriptor */

#define I40EVF_MAX_AQ_BUF_SIZE	4096

#define I40EVF_AQ_LEN		32

#define I40EVF_AQ_MAX_ERR	20 /* times to try before resetting AQ */

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

+15 −1
Original line number Diff line number Diff line
@@ -686,12 +686,26 @@ static void i40evf_configure_tx(struct i40evf_adapter *adapter) 
 **/

static void i40evf_configure_rx(struct i40evf_adapter *adapter)

{

	unsigned int rx_buf_len = I40E_RXBUFFER_2048;

	struct net_device *netdev = adapter->netdev;

	struct i40e_hw *hw = &adapter->hw;

	int i;



	/* Legacy Rx will always default to a 2048 buffer size. */

#if (PAGE_SIZE < 8192)

	if (!(adapter->flags & I40EVF_FLAG_LEGACY_RX)) {

		/* We use a 1536 buffer size for configurations with

		 * standard Ethernet mtu.  On x86 this gives us enough room

		 * for shared info and 192 bytes of padding.

		 */

		if (netdev->mtu <= ETH_DATA_LEN)

			rx_buf_len = I40E_RXBUFFER_1536 - NET_IP_ALIGN;

	}

#endif



	for (i = 0; i < adapter->num_active_queues; i++) {

		adapter->rx_rings[i].tail = hw->hw_addr + I40E_QRX_TAIL1(i);

		adapter->rx_rings[i].rx_buf_len = I40EVF_RXBUFFER_2048;

		adapter->rx_rings[i].rx_buf_len = rx_buf_len;

	}

}