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

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



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2019-11-04

This series contains updates to the ice driver only.

Anirudh refactors the code to reduce the kernel configuration flags and
introduces ice_base.c file.

Maciej does additional refactoring on the configuring of transmit
rings so that we are not configuring per each traffic class flow.
Added support for XDP in the ice driver.  Provides additional
re-organizing of the code in preparation for adding build_skb() support
in the driver.  Adjusted the computational padding logic for headroom
and tailroom to better support build_skb(), which also aligns with the
logic in other Intel LAN drivers.  Added build_skb support and make use
of the XDP's data_meta.

Krzysztof refactors the driver to prepare for AF_XDP support in the
driver and then adds support for AF_XDP.

v2: Updated patch 3 of the series based on community feedback with the
    following changes...
    - return -EOPNOTSUPP instead of ENOTSUPP for too large MTU which makes
      it impossible to attach XDP prog
    - don't check for case when there's no XDP prog currently on interface
      and ice_xdp() is called with NULL bpf_prog; this happens when user
      does "ip link set eth0 xdp off" and no prog is present on VSI; no need
      for that as it is handled by higher layer
    - drop the extack message for unknown xdp->command
    - use the smp_processor_id() for accessing the XDP Tx ring for XDP_TX
      action
    - don't leave the interface in downed state in case of any failure
      during the XDP Tx resources handling
    - undo rename of ice_build_ctob
    The above changes caused a ripple effect in patches 4 & 5 to update
    references to ice_build_ctob() which are now build_ctob()
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents eeb2045b 23b44513

drivers/net/ethernet/intel/ice/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -13,9 +13,12 @@ ice-y := ice_main.o \ 
	 ice_nvm.o	\

	 ice_switch.o	\

	 ice_sched.o	\

	 ice_base.o	\

	 ice_lib.o	\

	 ice_txrx_lib.o	\

	 ice_txrx.o	\

	 ice_flex_pipe.o	\

	 ice_ethtool.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o

ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_lib.o

ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o

drivers/net/ethernet/intel/ice/ice.h

+57 −2
Original line number Diff line number Diff line
@@ -29,10 +29,13 @@ 
#include <linux/ip.h>

#include <linux/sctp.h>

#include <linux/ipv6.h>

#include <linux/pkt_sched.h>

#include <linux/if_bridge.h>

#include <linux/ctype.h>

#include <linux/bpf.h>

#include <linux/avf/virtchnl.h>

#include <net/ipv6.h>

#include <net/xdp_sock.h>

#include "ice_devids.h"

#include "ice_type.h"

#include "ice_txrx.h"
@@ -42,6 +45,7 @@ 
#include "ice_sched.h"

#include "ice_virtchnl_pf.h"

#include "ice_sriov.h"

#include "ice_xsk.h"



extern const char ice_drv_ver[];

#define ICE_BAR0		0
@@ -78,8 +82,7 @@ extern const char ice_drv_ver[]; 


#define ICE_DFLT_NETIF_M (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)



#define ICE_MAX_MTU	(ICE_AQ_SET_MAC_FRAME_SIZE_MAX - \

			(ETH_HLEN + ETH_FCS_LEN + (VLAN_HLEN * 2)))

#define ICE_MAX_MTU	(ICE_AQ_SET_MAC_FRAME_SIZE_MAX - ICE_ETH_PKT_HDR_PAD)



#define ICE_UP_TABLE_TRANSLATE(val, i) \

		(((val) << ICE_AQ_VSI_UP_TABLE_UP##i##_S) & \
@@ -127,6 +130,14 @@ extern const char ice_drv_ver[]; 
				     ICE_PROMISC_VLAN_TX  | \

				     ICE_PROMISC_VLAN_RX)



struct ice_txq_meta {

	u32 q_teid;	/* Tx-scheduler element identifier */

	u16 q_id;	/* Entry in VSI's txq_map bitmap */

	u16 q_handle;	/* Relative index of Tx queue within TC */

	u16 vsi_idx;	/* VSI index that Tx queue belongs to */

	u8 tc;		/* TC number that Tx queue belongs to */

};



struct ice_tc_info {

	u16 qoffset;

	u16 qcount_tx;
@@ -274,6 +285,13 @@ struct ice_vsi { 
	u16 num_rx_desc;

	u16 num_tx_desc;

	struct ice_tc_cfg tc_cfg;

	struct bpf_prog *xdp_prog;

	struct ice_ring **xdp_rings;	 /* XDP ring array */

	u16 num_xdp_txq;		 /* Used XDP queues */

	u8 xdp_mapping_mode;		 /* ICE_MAP_MODE_[CONTIG|SCATTER] */

	struct xdp_umem **xsk_umems;

	u16 num_xsk_umems_used;

	u16 num_xsk_umems;

} ____cacheline_internodealigned_in_smp;



/* struct that defines an interrupt vector */
@@ -313,6 +331,7 @@ enum ice_pf_flags { 
	ICE_FLAG_NO_MEDIA,

	ICE_FLAG_FW_LLDP_AGENT,

	ICE_FLAG_ETHTOOL_CTXT,		/* set when ethtool holds RTNL lock */

	ICE_FLAG_LEGACY_RX,

	ICE_PF_FLAGS_NBITS		/* must be last */

};
@@ -417,6 +436,37 @@ static inline struct ice_pf *ice_netdev_to_pf(struct net_device *netdev) 
	return np->vsi->back;

}



static inline bool ice_is_xdp_ena_vsi(struct ice_vsi *vsi)

{

	return !!vsi->xdp_prog;

}



static inline void ice_set_ring_xdp(struct ice_ring *ring)

{

	ring->flags |= ICE_TX_FLAGS_RING_XDP;

}



/**

 * ice_xsk_umem - get XDP UMEM bound to a ring

 * @ring - ring to use

 *

 * Returns a pointer to xdp_umem structure if there is an UMEM present,

 * NULL otherwise.

 */

static inline struct xdp_umem *ice_xsk_umem(struct ice_ring *ring)

{

	struct xdp_umem **umems = ring->vsi->xsk_umems;

	int qid = ring->q_index;



	if (ice_ring_is_xdp(ring))

		qid -= ring->vsi->num_xdp_txq;



	if (!umems || !umems[qid] || !ice_is_xdp_ena_vsi(ring->vsi))

		return NULL;



	return umems[qid];

}



/**

 * ice_get_main_vsi - Get the PF VSI

 * @pf: PF instance
@@ -443,6 +493,11 @@ int ice_up(struct ice_vsi *vsi); 
int ice_down(struct ice_vsi *vsi);

int ice_vsi_cfg(struct ice_vsi *vsi);

struct ice_vsi *ice_lb_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi);

int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog);

int ice_destroy_xdp_rings(struct ice_vsi *vsi);

int

ice_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,

	     u32 flags);

int ice_set_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);

int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);

void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);

drivers/net/ethernet/intel/ice/ice_base.c

0 → 100644
+857 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/ice/ice_base.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright (c) 2019, Intel Corporation. */



#ifndef _ICE_BASE_H_

#define _ICE_BASE_H_



#include "ice.h"



int ice_setup_rx_ctx(struct ice_ring *ring);

int __ice_vsi_get_qs(struct ice_qs_cfg *qs_cfg);

int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx);

int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi);

void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi);

void ice_vsi_free_q_vectors(struct ice_vsi *vsi);

int

ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring,

		struct ice_aqc_add_tx_qgrp *qg_buf);

void ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector);

void

ice_cfg_txq_interrupt(struct ice_vsi *vsi, u16 txq, u16 msix_idx, u16 itr_idx);

void

ice_cfg_rxq_interrupt(struct ice_vsi *vsi, u16 rxq, u16 msix_idx, u16 itr_idx);

void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector);

int

ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,

		     u16 rel_vmvf_num, struct ice_ring *ring,

		     struct ice_txq_meta *txq_meta);

void

ice_fill_txq_meta(struct ice_vsi *vsi, struct ice_ring *ring,

		  struct ice_txq_meta *txq_meta);

#endif /* _ICE_BASE_H_ */

drivers/net/ethernet/intel/ice/ice_dcb_lib.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#define _ICE_DCB_LIB_H_



#include "ice.h"

#include "ice_base.h"

#include "ice_lib.h"



#ifdef CONFIG_DCB

CRA Git | Maintained and supported by SUSTech CRA and CCSE