Commit faeb8e7a 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/tnguy/next-queue 

Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2021-10-07

Michal Swiatkowski says:

The following patch series introduces basic switchdev model
support in ice driver. Implement the following blocks of
switchdev framework:
- VF port representors creation
- control plane VSI definition
- exception path (a. k. a. "slow-path") - to allow a virtual
switch or linux bridge to receive any packet that doesn't match
any hw filter
- link state management of virtual ports
- query virtual port statistics

Hardware offload support in switchdev mode is out of scope of
this patchset. Devlink interface is used to toggle between
switchdev and legacy (the default) modes of the driver.

---
Note: This series includes the use enum ice_status, however, we have
patches in our queue to remove it from the driver [1]. We are working
through the patches that precede the removal series.

[1] https://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=265957


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9fe11552 7aae80ce

drivers/net/ethernet/intel/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -313,6 +313,20 @@ config ICE 
	  To compile this driver as a module, choose M here. The module

	  will be called ice.



config ICE_SWITCHDEV

	bool "Switchdev Support"

	default y

	depends on ICE && NET_SWITCHDEV

	help

	  Switchdev support provides internal SRIOV packet steering and switching.



	  To enable it on running kernel use devlink tool:

	  #devlink dev eswitch set pci/0000:XX:XX.X mode switchdev



	  Say Y here if you want to use Switchdev in the driver.



	  If unsure, say N.



config FM10K

	tristate "Intel(R) FM10000 Ethernet Switch Host Interface Support"

	default n

drivers/net/ethernet/intel/ice/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -26,10 +26,12 @@ ice-y := ice_main.o \ 
	 ice_devlink.o	\

	 ice_fw_update.o \

	 ice_lag.o	\

	 ice_ethtool.o

	 ice_ethtool.o  \

	 ice_repr.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_allowlist.o

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

ice-$(CONFIG_PTP_1588_CLOCK) += ice_ptp.o ice_ptp_hw.o

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

ice-$(CONFIG_RFS_ACCEL) += ice_arfs.o

ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o

ice-$(CONFIG_ICE_SWITCHDEV) += ice_eswitch.o

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

+44 −4
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include "ice_fdir.h"

#include "ice_xsk.h"

#include "ice_arfs.h"

#include "ice_repr.h"

#include "ice_lag.h"



#define ICE_BAR0		0
@@ -84,6 +85,7 @@ 
#define ICE_FDIR_MSIX		2

#define ICE_RDMA_NUM_AEQ_MSIX	4

#define ICE_MIN_RDMA_MSIX	2

#define ICE_ESWITCH_MSIX	1

#define ICE_NO_VSI		0xffff

#define ICE_VSI_MAP_CONTIG	0

#define ICE_VSI_MAP_SCATTER	1
@@ -311,10 +313,6 @@ struct ice_vsi { 
	spinlock_t arfs_lock;	/* protects aRFS hash table and filter state */

	atomic_t *arfs_last_fltr_id;



	/* devlink port data */

	struct devlink_port devlink_port;

	bool devlink_port_registered;



	u16 max_frame;

	u16 rx_buf_len;
@@ -354,6 +352,8 @@ struct ice_vsi { 
	u16 num_xdp_txq;		 /* Used XDP queues */

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



	struct net_device **target_netdevs;



	/* setup back reference, to which aggregator node this VSI

	 * corresponds to

	 */
@@ -413,6 +413,12 @@ enum ice_pf_flags { 
	ICE_PF_FLAGS_NBITS		/* must be last */

};



struct ice_switchdev_info {

	struct ice_vsi *control_vsi;

	struct ice_vsi *uplink_vsi;

	bool is_running;

};



struct ice_agg_node {

	u32 agg_id;

#define ICE_MAX_VSIS_IN_AGG_NODE	64
@@ -426,6 +432,9 @@ struct ice_pf { 
	struct devlink_region *nvm_region;

	struct devlink_region *devcaps_region;



	/* devlink port data */

	struct devlink_port devlink_port;



	/* OS reserved IRQ details */

	struct msix_entry *msix_entries;

	struct ice_res_tracker *irq_tracker;
@@ -439,6 +448,7 @@ struct ice_pf { 


	struct ice_vsi **vsi;		/* VSIs created by the driver */

	struct ice_sw *first_sw;	/* first switch created by firmware */

	u16 eswitch_mode;		/* current mode of eswitch */

	/* Virtchnl/SR-IOV config info */

	struct ice_vf *vf;

	u16 num_alloc_vfs;		/* actual number of VFs allocated */
@@ -507,6 +517,8 @@ struct ice_pf { 
	struct ice_link_default_override_tlv link_dflt_override;

	struct ice_lag *lag; /* Link Aggregation information */



	struct ice_switchdev_info switchdev;



#define ICE_INVALID_AGG_NODE_ID		0

#define ICE_PF_AGG_NODE_ID_START	1

#define ICE_MAX_PF_AGG_NODES		32
@@ -518,6 +530,7 @@ struct ice_pf { 


struct ice_netdev_priv {

	struct ice_vsi *vsi;

	struct ice_repr *repr;

};



/**
@@ -602,6 +615,19 @@ static inline struct ice_vsi *ice_get_main_vsi(struct ice_pf *pf) 
	return NULL;

}



/**

 * ice_get_netdev_priv_vsi - return VSI associated with netdev priv.

 * @np: private netdev structure

 */

static inline struct ice_vsi *ice_get_netdev_priv_vsi(struct ice_netdev_priv *np)

{

	/* In case of port representor return source port VSI. */

	if (np->repr)

		return np->repr->src_vsi;

	else

		return np->vsi;

}



/**

 * ice_get_ctrl_vsi - Get the control VSI

 * @pf: PF instance
@@ -615,6 +641,18 @@ static inline struct ice_vsi *ice_get_ctrl_vsi(struct ice_pf *pf) 
	return pf->vsi[pf->ctrl_vsi_idx];

}



/**

 * ice_is_switchdev_running - check if switchdev is configured

 * @pf: pointer to PF structure

 *

 * Returns true if eswitch mode is set to DEVLINK_ESWITCH_MODE_SWITCHDEV

 * and switchdev is configured, false otherwise.

 */

static inline bool ice_is_switchdev_running(struct ice_pf *pf)

{

	return pf->switchdev.is_running;

}



/**

 * ice_set_sriov_cap - enable SRIOV in PF flags

 * @pf: PF struct
@@ -643,7 +681,9 @@ bool netif_is_ice(struct net_device *dev); 
int ice_vsi_setup_tx_rings(struct ice_vsi *vsi);

int ice_vsi_setup_rx_rings(struct ice_vsi *vsi);

int ice_vsi_open_ctrl(struct ice_vsi *vsi);

int ice_vsi_open(struct ice_vsi *vsi);

void ice_set_ethtool_ops(struct net_device *netdev);

void ice_set_ethtool_repr_ops(struct net_device *netdev);

void ice_set_ethtool_safe_mode_ops(struct net_device *netdev);

u16 ice_get_avail_txq_count(struct ice_pf *pf);

u16 ice_get_avail_rxq_count(struct ice_pf *pf);

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

+35 −1
Original line number Diff line number Diff line
@@ -217,6 +217,30 @@ static u16 ice_calc_q_handle(struct ice_vsi *vsi, struct ice_ring *ring, u8 tc) 
	return ring->q_index - vsi->tc_cfg.tc_info[tc].qoffset;

}



/**

 * ice_eswitch_calc_q_handle

 * @ring: pointer to ring which unique index is needed

 *

 * To correctly work with many netdevs ring->q_index of Tx rings on switchdev

 * VSI can repeat. Hardware ring setup requires unique q_index. Calculate it

 * here by finding index in vsi->tx_rings of this ring.

 *

 * Return ICE_INVAL_Q_INDEX when index wasn't found. Should never happen,

 * because VSI is get from ring->vsi, so it has to be present in this VSI.

 */

static u16 ice_eswitch_calc_q_handle(struct ice_ring *ring)

{

	struct ice_vsi *vsi = ring->vsi;

	int i;



	ice_for_each_txq(vsi, i) {

		if (vsi->tx_rings[i] == ring)

			return i;

	}



	return ICE_INVAL_Q_INDEX;

}



/**

 * ice_cfg_xps_tx_ring - Configure XPS for a Tx ring

 * @ring: The Tx ring to configure
@@ -280,6 +304,9 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) 
		tlan_ctx->vmvf_num = hw->func_caps.vf_base_id + vsi->vf_id;

		tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VF;

		break;

	case ICE_VSI_SWITCHDEV_CTRL:

		tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VMQ;

		break;

	default:

		return;

	}
@@ -746,7 +773,14 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring, 
	/* Add unique software queue handle of the Tx queue per

	 * TC into the VSI Tx ring

	 */

	if (vsi->type == ICE_VSI_SWITCHDEV_CTRL) {

		ring->q_handle = ice_eswitch_calc_q_handle(ring);



		if (ring->q_handle == ICE_INVAL_Q_INDEX)

			return -ENODEV;

	} else {

		ring->q_handle = ice_calc_q_handle(vsi, ring, tc);

	}



	status = ice_ena_vsi_txq(vsi->port_info, vsi->idx, tc, ring->q_handle,

				 1, qg_buf, buf_len, NULL);

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

+5 −0
Original line number Diff line number Diff line
@@ -683,6 +683,11 @@ void ice_pf_dcb_recfg(struct ice_pf *pf) 
				vsi->idx);

			continue;

		}

		/* no need to proceed with remaining cfg if it is switchdev

		 * VSI

		 */

		if (vsi->type == ICE_VSI_SWITCHDEV_CTRL)

			continue;



		ice_vsi_map_rings_to_vectors(vsi);

		if (vsi->type == ICE_VSI_PF)