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

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

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



Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2018-10-03

This series contains updates to ixgbe/ixgbevf and few fixes for i40e & iavf.

Shannon Nelson fixes the message length for IPsec mailbox messages.

Radoslaw fixes a transmit hang that occurs when XDP_TX exceeds the queue
limit.  Fixes a crash when we restor flow director filters after a reset.

YueHaibing cleans up dead code, which did not have any callers.

Dan Carpenter fixes an "off by one" error in IPsec for ixgbe.

Nathan Chancellor fixes the i40e driver to use the correct enum for link
speed.  Also remove a debug statement since it was not producing useful
information and equated to always "TRUE".

Most notably, Björn introduces zero-copy AF_XDP support for the ixgbe
driver.  The ixgbe zero-copy code is located in its own file ixgbe_xsk.[ch],
analogous to the i40e ZC support. Again, as in i40e, code paths have
been copied from the XDP path to the zero-copy path. Going forward we
will try to generalize more code between the AF_XDP ZC drivers, and
also reduce the heavy C&P.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 072eff2d 37ebb5fa

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

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
		dev_info(&pf->pdev->dev, "        vlan_features = 0x%08lx\n",

			 (unsigned long int)nd->vlan_features);

	}

	dev_info(&pf->pdev->dev, "    active_vlans is %s\n",

		 vsi->active_vlans ? "<valid>" : "<null>");

	dev_info(&pf->pdev->dev,

		 "    flags = 0x%08lx, netdev_registered = %i, current_netdev_flags = 0x%04x\n",

		 vsi->flags, vsi->netdev_registered, vsi->current_netdev_flags);

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

+1 −1
Original line number Diff line number Diff line
@@ -4256,7 +4256,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link) 
		vf->link_forced = true;

		vf->link_up = true;

		pfe.event_data.link_event.link_status = true;

		pfe.event_data.link_event.link_speed = I40E_LINK_SPEED_40GB;

		pfe.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_40GB;

		break;

	case IFLA_VF_LINK_STATE_DISABLE:

		vf->link_forced = true;

drivers/net/ethernet/intel/iavf/iavf.h

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ struct iavf_adapter { 
	struct iavf_channel_config ch_config;

	u8 num_tc;

	struct list_head cloud_filter_list;

	/* lock to protest access to the cloud filter list */

	/* lock to protect access to the cloud filter list */

	spinlock_t cloud_filter_list_lock;

	u16 num_cloud_filters;

};

drivers/net/ethernet/intel/ixgbe/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ obj-$(CONFIG_IXGBE) += ixgbe.o 


ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_ethtool.o \

              ixgbe_82599.o ixgbe_82598.o ixgbe_phy.o ixgbe_sriov.o \

              ixgbe_mbx.o ixgbe_x540.o ixgbe_x550.o ixgbe_lib.o ixgbe_ptp.o

              ixgbe_mbx.o ixgbe_x540.o ixgbe_x550.o ixgbe_lib.o ixgbe_ptp.o \

              ixgbe_xsk.o



ixgbe-$(CONFIG_IXGBE_DCB) +=  ixgbe_dcb.o ixgbe_dcb_82598.o \

                              ixgbe_dcb_82599.o ixgbe_dcb_nl.o

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+21 −7
Original line number Diff line number Diff line
@@ -228,14 +228,18 @@ struct ixgbe_tx_buffer { 
struct ixgbe_rx_buffer {

	struct sk_buff *skb;

	dma_addr_t dma;

	union {

		struct {

			struct page *page;

#if (BITS_PER_LONG > 32) || (PAGE_SIZE >= 65536)

			__u32 page_offset;

#else

	__u16 page_offset;

#endif

			__u16 pagecnt_bias;

		};

		struct {

			void *addr;

			u64 handle;

		};

	};

};



struct ixgbe_queue_stats {

	u64 packets;
@@ -271,6 +275,7 @@ enum ixgbe_ring_state_t { 
	__IXGBE_TX_DETECT_HANG,

	__IXGBE_HANG_CHECK_ARMED,

	__IXGBE_TX_XDP_RING,

	__IXGBE_TX_DISABLED,

};



#define ring_uses_build_skb(ring) \
@@ -347,6 +352,10 @@ struct ixgbe_ring { 
		struct ixgbe_rx_queue_stats rx_stats;

	};

	struct xdp_rxq_info xdp_rxq;

	struct xdp_umem *xsk_umem;

	struct zero_copy_allocator zca; /* ZC allocator anchor */

	u16 ring_idx;		/* {rx,tx,xdp}_ring back reference idx */

	u16 rx_buf_len;

} ____cacheline_internodealigned_in_smp;



enum ixgbe_ring_f_enum {
@@ -764,6 +773,11 @@ struct ixgbe_adapter { 
#ifdef CONFIG_XFRM_OFFLOAD

	struct ixgbe_ipsec *ipsec;

#endif /* CONFIG_XFRM_OFFLOAD */



	/* AF_XDP zero-copy */

	struct xdp_umem **xsk_umems;

	u16 num_xsk_umems_used;

	u16 num_xsk_umems;

};



static inline u8 ixgbe_max_rss_indices(struct ixgbe_adapter *adapter)