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

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
1GbE Intel Wired LAN Driver Updates 2017-03-17

This series contains updates to mainly igb, with one fix for ixgbe.

Alex does all the changes in the series, starting with adding support
for DMA_ATTR_WEAK_ORDERING to improve performance on some platforms.
Modified igb to use the length of the packet instead of the DD status
bit to determine if a new descriptor is ready to be processed.  Modified
the driver to only go through the region in the receive ring that was
designated to be cleaned up, instead of going through the entire ring
on cleanup.  Cleaned up the transmit side, by clearing the transmit
buffer_info only when resetting the rings.  Added a new upper limit for
receive, which is based on the size of a 2K buffer minus padding, which
will allow us to support build_skb going forward.  Fixed ethtool testing
to only sync on the size of the frame that is being tested, instead of
the entire receive buffer.  Updated the handling of page addresses to
always use a void pointer with the consistent name of "va" to indicate
that we are working with a virtual address.  Added a "chicken bit" so
that we can turn off the new receive allocation feature, in the case
where we need to fallback to the legacy receive path.  Added support for
using 3K buffers in order 1 pages the same way we were using 2K buffers
in 4K pages.  Added support for padding packet, since we limit the size
of the frame, we are able to write to an offset within the buffer instead
of having to write at the very start of the buffer.  This allows us to
leaving padding room for things like supporting XDP in the future.
Refactored the receive buffer page management, since there are 2-3 paths
that can be taken depending on what receive modes are enabled, so to
improve maintainability, break out the common bits into their own
functions.  Add support for build_skb, again.  Lastly, fixed a typo in
igb and ixgbe code comments.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fe723dff 3a1eb6d1

drivers/net/ethernet/intel/igb/igb.h

+54 −4
Original line number Diff line number Diff line
@@ -142,12 +142,24 @@ struct vf_data_storage { 
/* Supported Rx Buffer Sizes */

#define IGB_RXBUFFER_256	256

#define IGB_RXBUFFER_2048	2048

#define IGB_RXBUFFER_3072	3072

#define IGB_RX_HDR_LEN		IGB_RXBUFFER_256

#define IGB_RX_BUFSZ		IGB_RXBUFFER_2048

#define IGB_TS_HDR_LEN		16



#define IGB_SKB_PAD		(NET_SKB_PAD + NET_IP_ALIGN)

#if (PAGE_SIZE < 8192)

#define IGB_MAX_FRAME_BUILD_SKB \

	(SKB_WITH_OVERHEAD(IGB_RXBUFFER_2048) - IGB_SKB_PAD - IGB_TS_HDR_LEN)

#else

#define IGB_MAX_FRAME_BUILD_SKB (IGB_RXBUFFER_2048 - IGB_TS_HDR_LEN)

#endif



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

#define IGB_RX_BUFFER_WRITE	16 /* Must be power of 2 */



#define IGB_RX_DMA_ATTR \

	(DMA_ATTR_SKIP_CPU_SYNC | DMA_ATTR_WEAK_ORDERING)



#define AUTO_ALL_MODES		0

#define IGB_EEPROM_APME		0x0400
@@ -301,12 +313,51 @@ struct igb_q_vector { 
};



enum e1000_ring_flags_t {

	IGB_RING_FLAG_RX_3K_BUFFER,

	IGB_RING_FLAG_RX_BUILD_SKB_ENABLED,

	IGB_RING_FLAG_RX_SCTP_CSUM,

	IGB_RING_FLAG_RX_LB_VLAN_BSWAP,

	IGB_RING_FLAG_TX_CTX_IDX,

	IGB_RING_FLAG_TX_DETECT_HANG

};



#define ring_uses_large_buffer(ring) \

	test_bit(IGB_RING_FLAG_RX_3K_BUFFER, &(ring)->flags)

#define set_ring_uses_large_buffer(ring) \

	set_bit(IGB_RING_FLAG_RX_3K_BUFFER, &(ring)->flags)

#define clear_ring_uses_large_buffer(ring) \

	clear_bit(IGB_RING_FLAG_RX_3K_BUFFER, &(ring)->flags)



#define ring_uses_build_skb(ring) \

	test_bit(IGB_RING_FLAG_RX_BUILD_SKB_ENABLED, &(ring)->flags)

#define set_ring_build_skb_enabled(ring) \

	set_bit(IGB_RING_FLAG_RX_BUILD_SKB_ENABLED, &(ring)->flags)

#define clear_ring_build_skb_enabled(ring) \

	clear_bit(IGB_RING_FLAG_RX_BUILD_SKB_ENABLED, &(ring)->flags)



static inline unsigned int igb_rx_bufsz(struct igb_ring *ring)

{

#if (PAGE_SIZE < 8192)

	if (ring_uses_large_buffer(ring))

		return IGB_RXBUFFER_3072;



	if (ring_uses_build_skb(ring))

		return IGB_MAX_FRAME_BUILD_SKB + IGB_TS_HDR_LEN;

#endif

	return IGB_RXBUFFER_2048;

}



static inline unsigned int igb_rx_pg_order(struct igb_ring *ring)

{

#if (PAGE_SIZE < 8192)

	if (ring_uses_large_buffer(ring))

		return 1;

#endif

	return 0;

}



#define igb_rx_pg_size(_ring) (PAGE_SIZE << igb_rx_pg_order(_ring))



#define IGB_TXD_DCMD (E1000_ADVTXD_DCMD_EOP | E1000_ADVTXD_DCMD_RS)



#define IGB_RX_DESC(R, i)	\
@@ -545,6 +596,7 @@ struct igb_adapter { 
#define IGB_FLAG_HAS_MSIX		BIT(13)

#define IGB_FLAG_EEE			BIT(14)

#define IGB_FLAG_VLAN_PROMISC		BIT(15)

#define IGB_FLAG_RX_LEGACY		BIT(16)



/* Media Auto Sense */

#define IGB_MAS_ENABLE_0		0X0001
@@ -558,7 +610,6 @@ struct igb_adapter { 
#define IGB_DMCTLX_DCFLUSH_DIS	0x80000000  /* Disable DMA Coal Flush */



#define IGB_82576_TSYNC_SHIFT	19

#define IGB_TS_HDR_LEN		16

enum e1000_state_t {

	__IGB_TESTING,

	__IGB_RESETTING,
@@ -591,7 +642,6 @@ void igb_configure_rx_ring(struct igb_adapter *, struct igb_ring *); 
void igb_setup_tctl(struct igb_adapter *);

void igb_setup_rctl(struct igb_adapter *);

netdev_tx_t igb_xmit_frame_ring(struct sk_buff *, struct igb_ring *);

void igb_unmap_and_free_tx_resource(struct igb_ring *, struct igb_tx_buffer *);

void igb_alloc_rx_buffers(struct igb_ring *, u16);

void igb_update_stats(struct igb_adapter *, struct rtnl_link_stats64 *);

bool igb_has_link(struct igb_adapter *adapter);
@@ -604,7 +654,7 @@ void igb_ptp_reset(struct igb_adapter *adapter); 
void igb_ptp_suspend(struct igb_adapter *adapter);

void igb_ptp_rx_hang(struct igb_adapter *adapter);

void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb);

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, unsigned char *va,

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va,

			 struct sk_buff *skb);

int igb_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr);

int igb_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr);

drivers/net/ethernet/intel/igb/igb_ethtool.c

+61 −4
Original line number Diff line number Diff line
@@ -144,6 +144,13 @@ static const char igb_gstrings_test[][ETH_GSTRING_LEN] = { 
};

#define IGB_TEST_LEN (sizeof(igb_gstrings_test) / ETH_GSTRING_LEN)



static const char igb_priv_flags_strings[][ETH_GSTRING_LEN] = {

#define IGB_PRIV_FLAGS_LEGACY_RX	BIT(0)

	"legacy-rx",

};



#define IGB_PRIV_FLAGS_STR_LEN ARRAY_SIZE(igb_priv_flags_strings)



static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)

{

	struct igb_adapter *adapter = netdev_priv(netdev);
@@ -852,6 +859,8 @@ static void igb_get_drvinfo(struct net_device *netdev, 
		sizeof(drvinfo->fw_version));

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

		sizeof(drvinfo->bus_info));



	drvinfo->n_priv_flags = IGB_PRIV_FLAGS_STR_LEN;

}



static void igb_get_ringparam(struct net_device *netdev,
@@ -1811,14 +1820,14 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring, 
	tx_ntc = tx_ring->next_to_clean;

	rx_desc = IGB_RX_DESC(rx_ring, rx_ntc);



	while (igb_test_staterr(rx_desc, E1000_RXD_STAT_DD)) {

	while (rx_desc->wb.upper.length) {

		/* check Rx buffer */

		rx_buffer_info = &rx_ring->rx_buffer_info[rx_ntc];



		/* sync Rx buffer for CPU read */

		dma_sync_single_for_cpu(rx_ring->dev,

					rx_buffer_info->dma,

					IGB_RX_BUFSZ,

					size,

					DMA_FROM_DEVICE);



		/* verify contents of skb */
@@ -1828,12 +1837,21 @@ static int igb_clean_test_rings(struct igb_ring *rx_ring, 
		/* sync Rx buffer for device write */

		dma_sync_single_for_device(rx_ring->dev,

					   rx_buffer_info->dma,

					   IGB_RX_BUFSZ,

					   size,

					   DMA_FROM_DEVICE);



		/* unmap buffer on Tx side */

		tx_buffer_info = &tx_ring->tx_buffer_info[tx_ntc];

		igb_unmap_and_free_tx_resource(tx_ring, tx_buffer_info);



		/* Free all the Tx ring sk_buffs */

		dev_kfree_skb_any(tx_buffer_info->skb);



		/* unmap skb header data */

		dma_unmap_single(tx_ring->dev,

				 dma_unmap_addr(tx_buffer_info, dma),

				 dma_unmap_len(tx_buffer_info, len),

				 DMA_TO_DEVICE);

		dma_unmap_len_set(tx_buffer_info, len, 0);



		/* increment Rx/Tx next to clean counters */

		rx_ntc++;
@@ -2271,6 +2289,8 @@ static int igb_get_sset_count(struct net_device *netdev, int sset) 
		return IGB_STATS_LEN;

	case ETH_SS_TEST:

		return IGB_TEST_LEN;

	case ETH_SS_PRIV_FLAGS:

		return IGB_PRIV_FLAGS_STR_LEN;

	default:

		return -ENOTSUPP;

	}
@@ -2376,6 +2396,10 @@ static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data) 
		}

		/* BUG_ON(p - data != IGB_STATS_LEN * ETH_GSTRING_LEN); */

		break;

	case ETH_SS_PRIV_FLAGS:

		memcpy(data, igb_priv_flags_strings,

		       IGB_PRIV_FLAGS_STR_LEN * ETH_GSTRING_LEN);

		break;

	}

}
@@ -3388,6 +3412,37 @@ static int igb_set_channels(struct net_device *netdev, 
	return 0;

}



static u32 igb_get_priv_flags(struct net_device *netdev)

{

	struct igb_adapter *adapter = netdev_priv(netdev);

	u32 priv_flags = 0;



	if (adapter->flags & IGB_FLAG_RX_LEGACY)

		priv_flags |= IGB_PRIV_FLAGS_LEGACY_RX;



	return priv_flags;

}



static int igb_set_priv_flags(struct net_device *netdev, u32 priv_flags)

{

	struct igb_adapter *adapter = netdev_priv(netdev);

	unsigned int flags = adapter->flags;



	flags &= ~IGB_FLAG_RX_LEGACY;

	if (priv_flags & IGB_PRIV_FLAGS_LEGACY_RX)

		flags |= IGB_FLAG_RX_LEGACY;



	if (flags != adapter->flags) {

		adapter->flags = flags;



		/* reset interface to repopulate queues */

		if (netif_running(netdev))

			igb_reinit_locked(adapter);

	}



	return 0;

}



static const struct ethtool_ops igb_ethtool_ops = {

	.get_settings		= igb_get_settings,

	.set_settings		= igb_set_settings,
@@ -3426,6 +3481,8 @@ static const struct ethtool_ops igb_ethtool_ops = { 
	.set_rxfh		= igb_set_rxfh,

	.get_channels		= igb_get_channels,

	.set_channels		= igb_set_channels,

	.get_priv_flags		= igb_get_priv_flags,

	.set_priv_flags		= igb_set_priv_flags,

	.begin			= igb_ethtool_begin,

	.complete		= igb_ethtool_complete,

};

drivers/net/ethernet/intel/igb/igb_main.c

+322 −192

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/igb/igb_ptp.c

+1 −2
Original line number Diff line number Diff line
@@ -764,8 +764,7 @@ static void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter) 
 * incoming frame.  The value is stored in little endian format starting on

 * byte 8.

 **/

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector,

			 unsigned char *va,

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, void *va,

			 struct sk_buff *skb)

{

	__le64 *regval = (__le64 *)va;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,7 @@ static struct sk_buff *ixgbe_build_skb(struct ixgbe_ring *rx_ring, 
	prefetch(va + L1_CACHE_BYTES);

#endif



	/* build an skb to around the page buffer */

	/* build an skb around the page buffer */

	skb = build_skb(va - IXGBE_SKB_PAD, truesize);

	if (unlikely(!skb))

		return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE