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

i40evf: refactor receive routine 



This is part 2 of the Rx refactor series, just including
changes to i40evf.

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 VF ethtool control over packet split
- remove priv_flags interface since it is unused

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 19b85e67

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

+455 −443

File changed.

Preview size limit exceeded, changes collapsed.

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

+25 −12
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ enum i40e_dyn_idx_t { 
	(((pf)->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE) ? \

	  I40E_DEFAULT_RSS_HENA_EXPANDED : I40E_DEFAULT_RSS_HENA)



/* Supported Rx Buffer Sizes */

#define I40E_RXBUFFER_512   512    /* Used for packet split */

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

#define I40E_RXBUFFER_256   256

#define I40E_RXBUFFER_2048  2048

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

#define I40E_RXBUFFER_4096  4096
@@ -114,9 +114,28 @@ enum i40e_dyn_idx_t { 
 * reserve 2 more, and skb_shared_info adds an additional 384 bytes more,

 * this adds up to 512 bytes of extra data meaning the smallest allocation

 * we could have is 1K.

 * i.e. RXBUFFER_512 --> size-1024 slab

 * i.e. RXBUFFER_256 --> 960 byte skb (size-1024 slab)

 * i.e. RXBUFFER_512 --> 1216 byte skb (size-2048 slab)

 */

#define I40E_RX_HDR_SIZE  I40E_RXBUFFER_512

#define I40E_RX_HDR_SIZE I40E_RXBUFFER_256

#define i40e_rx_desc i40e_32byte_rx_desc



/**

 * i40e_test_staterr - tests bits in Rx descriptor status and error fields

 * @rx_desc: pointer to receive descriptor (in le64 format)

 * @stat_err_bits: value to mask

 *

 * This function does some fast chicanery in order to return the

 * value of the mask which is really only used for boolean tests.

 * The status_error_len doesn't need to be shifted because it begins

 * at offset zero.

 */

static inline bool i40e_test_staterr(union i40e_rx_desc *rx_desc,

				     const u64 stat_err_bits)

{

	return !!(rx_desc->wb.qword1.status_error_len &

		  cpu_to_le64(stat_err_bits));

}



/* How many Rx Buffers do we bundle into one write to the hardware ? */

#define I40E_RX_BUFFER_WRITE	16	/* Must be power of 2 */
@@ -142,8 +161,6 @@ enum i40e_dyn_idx_t { 
		prefetch((n));				\

	} while (0)



#define i40e_rx_desc i40e_32byte_rx_desc



#define I40E_MAX_BUFFER_TXD	8

#define I40E_MIN_TX_LEN		17
@@ -212,10 +229,8 @@ struct i40e_tx_buffer { 


struct i40e_rx_buffer {

	struct sk_buff *skb;

	void *hdr_buf;

	dma_addr_t dma;

	struct page *page;

	dma_addr_t page_dma;

	unsigned int page_offset;

};
@@ -271,7 +286,6 @@ struct i40e_ring { 


	u16 count;			/* Number of descriptors */

	u16 reg_idx;			/* HW register index of the ring */

	u16 rx_hdr_len;

	u16 rx_buf_len;

#define I40E_RX_DTYPE_NO_SPLIT      0

#define I40E_RX_DTYPE_HEADER_SPLIT  1
@@ -311,6 +325,7 @@ struct i40e_ring { 
	struct i40e_q_vector *q_vector;	/* Backreference to associated vector */



	struct rcu_head rcu;		/* to avoid race on free */

	u16 next_to_alloc;

} ____cacheline_internodealigned_in_smp;



enum i40e_latency_range {
@@ -334,9 +349,7 @@ struct i40e_ring_container { 
#define i40e_for_each_ring(pos, head) \

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



bool i40evf_alloc_rx_buffers_ps(struct i40e_ring *rxr, u16 cleaned_count);

bool i40evf_alloc_rx_buffers_1buf(struct i40e_ring *rxr, u16 cleaned_count);

void i40evf_alloc_rx_headers(struct i40e_ring *rxr);

bool i40evf_alloc_rx_buffers(struct i40e_ring *rxr, u16 cleaned_count);

netdev_tx_t i40evf_xmit_frame(struct sk_buff *skb, struct net_device *netdev);

void i40evf_clean_tx_ring(struct i40e_ring *tx_ring);

void i40evf_clean_rx_ring(struct i40e_ring *rx_ring);

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

+0 −5
Original line number Diff line number Diff line
@@ -80,9 +80,6 @@ struct i40e_vsi { 
#define I40EVF_REQ_DESCRIPTOR_MULTIPLE  32



/* Supported Rx Buffer Sizes */

#define I40EVF_RXBUFFER_64    64     /* Used for packet split */

#define I40EVF_RXBUFFER_128   128    /* Used for packet split */

#define I40EVF_RXBUFFER_256   256    /* Used for packet split */

#define I40EVF_RXBUFFER_2048  2048

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

#define I40EVF_MAX_AQ_BUF_SIZE    4096
@@ -208,7 +205,6 @@ struct i40evf_adapter { 


	u32 flags;

#define I40EVF_FLAG_RX_CSUM_ENABLED              BIT(0)

#define I40EVF_FLAG_RX_1BUF_CAPABLE              BIT(1)

#define I40EVF_FLAG_IMIR_ENABLED                 BIT(5)

#define I40EVF_FLAG_MQ_CAPABLE                   BIT(6)

#define I40EVF_FLAG_NEED_LINK_UPDATE             BIT(7)
@@ -293,7 +289,6 @@ struct i40evf_adapter { 




/* Ethtool Private Flags */

#define I40EVF_PRIV_FLAGS_PS		BIT(0)



/* needed by i40evf_ethtool.c */

extern char i40evf_driver_name[];

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

+0 −51
Original line number Diff line number Diff line
@@ -63,12 +63,6 @@ static const struct i40evf_stats i40evf_gstrings_stats[] = { 
#define I40EVF_STATS_LEN(_dev) \

	(I40EVF_GLOBAL_STATS_LEN + I40EVF_QUEUE_STATS_LEN(_dev))



static const char i40evf_priv_flags_strings[][ETH_GSTRING_LEN] = {

	"packet-split",

};



#define I40EVF_PRIV_FLAGS_STR_LEN ARRAY_SIZE(i40evf_priv_flags_strings)



/**

 * i40evf_get_settings - Get Link Speed and Duplex settings

 * @netdev: network interface device structure
@@ -103,8 +97,6 @@ static int i40evf_get_sset_count(struct net_device *netdev, int sset) 
{

	if (sset == ETH_SS_STATS)

		return I40EVF_STATS_LEN(netdev);

	else if (sset == ETH_SS_PRIV_FLAGS)

		return I40EVF_PRIV_FLAGS_STR_LEN;

	else

		return -EINVAL;

}
@@ -170,12 +162,6 @@ static void i40evf_get_strings(struct net_device *netdev, u32 sset, u8 *data) 
			snprintf(p, ETH_GSTRING_LEN, "rx-%u.bytes", i);

			p += ETH_GSTRING_LEN;

		}

	} else if (sset == ETH_SS_PRIV_FLAGS) {

		for (i = 0; i < I40EVF_PRIV_FLAGS_STR_LEN; i++) {

			memcpy(data, i40evf_priv_flags_strings[i],

			       ETH_GSTRING_LEN);

			data += ETH_GSTRING_LEN;

		}

	}

}
@@ -225,7 +211,6 @@ static void i40evf_get_drvinfo(struct net_device *netdev, 
	strlcpy(drvinfo->version, i40evf_driver_version, 32);

	strlcpy(drvinfo->fw_version, "N/A", 4);

	strlcpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);

	drvinfo->n_priv_flags = I40EVF_PRIV_FLAGS_STR_LEN;

}



/**
@@ -515,40 +500,6 @@ static int i40evf_set_rxfh(struct net_device *netdev, const u32 *indir, 
	return i40evf_config_rss(adapter);

}



/**

 * i40evf_get_priv_flags - report device private flags

 * @dev: network interface device structure

 *

 * The get string set count and the string set should be matched for each

 * flag returned.  Add new strings for each flag to the i40e_priv_flags_strings

 * array.

 *

 * Returns a u32 bitmap of flags.

 **/

static u32 i40evf_get_priv_flags(struct net_device *dev)

{

	u32 ret_flags = 0;



	return ret_flags;

}



/**

 * i40evf_set_priv_flags - set private flags

 * @dev: network interface device structure

 * @flags: bit flags to be set

 **/

static int i40evf_set_priv_flags(struct net_device *dev, u32 flags)

{

	struct i40evf_adapter *adapter = netdev_priv(dev);

	bool reset_required = false;



	/* if needed, issue reset to cause things to take effect */

	if (reset_required)

		i40evf_schedule_reset(adapter);



	return 0;

}



static const struct ethtool_ops i40evf_ethtool_ops = {

	.get_settings		= i40evf_get_settings,

	.get_drvinfo		= i40evf_get_drvinfo,
@@ -558,8 +509,6 @@ static const struct ethtool_ops i40evf_ethtool_ops = { 
	.get_strings		= i40evf_get_strings,

	.get_ethtool_stats	= i40evf_get_ethtool_stats,

	.get_sset_count		= i40evf_get_sset_count,

	.get_priv_flags		= i40evf_get_priv_flags,

	.set_priv_flags		= i40evf_set_priv_flags,

	.get_msglevel		= i40evf_get_msglevel,

	.set_msglevel		= i40evf_set_msglevel,

	.get_coalesce		= i40evf_get_coalesce,

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

+1 −2
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ static void i40evf_configure(struct i40evf_adapter *adapter) 
	for (i = 0; i < adapter->num_active_queues; i++) {

		struct i40e_ring *ring = &adapter->rx_rings[i];



		i40evf_alloc_rx_buffers_1buf(ring, ring->count);

		i40evf_alloc_rx_buffers(ring, ring->count);

		ring->next_to_use = ring->count - 1;

		writel(ring->next_to_use, ring->tail);

	}
@@ -2401,7 +2401,6 @@ static void i40evf_init_task(struct work_struct *work) 
	adapter->current_op = I40E_VIRTCHNL_OP_UNKNOWN;



	adapter->flags |= I40EVF_FLAG_RX_CSUM_ENABLED;

	adapter->flags |= I40EVF_FLAG_RX_1BUF_CAPABLE;



	netdev->netdev_ops = &i40evf_netdev_ops;

	i40evf_set_ethtool_ops(netdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE