Commit 2b1a7f74 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 2020-05-22

This series contains updates to virtchnl and the ice driver.

Geert Uytterhoeven fixes a data structure alignment issue in the
virtchnl structures.

Henry adds Flow Director support which allows for the redirection on
ntuple rules over six patches.  Initially Henry adds the initial
infrastructure for Flow Director, and then later adds IPv4 and IPv6
support, as well as being able to display the ntuple rules.

Bret add Accelerated Receive Flow Steering (aRFS) support which is used
to steer receive flows to a specific queue.  Fixes a transmit timeout
when the VF link transitions from up/down/up because the transmit and
receive queue interrupts are not enabled as part of VF's link up.  Fixed
an issue when the default VF LAN address is changed and after reset the
PF will attempt to add the new MAC, which fails because it already
exists. This causes the VF to be disabled completely until it is removed
and enabled via sysfs.

Anirudh (Ani) makes a fix where the ice driver needs to call set_mac_cfg
to enable jumbo frames, so ensure it gets called during initialization
and after reset.  Fix bad register reads during a register dump in
ethtool by removing the bad registers.

Paul fixes an issue where the receive Malicious Driver Detection (MDD)
auto reset message was not being logged because it occurred after the VF
reset.

Victor adds a check for compatibility between the Dynamic Device
Personalization (DDP) package and the NIC firmware to ensure that
everything aligns.

Jesse fixes a administrative queue string call with the appropriate
error reporting variable.  Also fixed the loop variables that are
comparing or assigning signed against unsigned values.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 098205f3 c1e08830

drivers/net/ethernet/intel/ice/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -18,10 +18,13 @@ ice-y := ice_main.o \ 
	 ice_txrx_lib.o	\

	 ice_txrx.o	\

	 ice_fltr.o	\

	 ice_fdir.o	\

	 ice_ethtool_fdir.o \

	 ice_flex_pipe.o \

	 ice_flow.o	\

	 ice_devlink.o	\

	 ice_ethtool.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.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

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

+53 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/ctype.h>

#include <linux/bpf.h>

#include <linux/avf/virtchnl.h>

#include <linux/cpu_rmap.h>

#include <net/devlink.h>

#include <net/ipv6.h>

#include <net/xdp_sock.h>
@@ -50,7 +51,9 @@ 
#include "ice_sched.h"

#include "ice_virtchnl_pf.h"

#include "ice_sriov.h"

#include "ice_fdir.h"

#include "ice_xsk.h"

#include "ice_arfs.h"



extern const char ice_drv_ver[];

#define ICE_BAR0		0
@@ -66,6 +69,7 @@ extern const char ice_drv_ver[]; 
#define ICE_AQ_LEN		64

#define ICE_MBXSQ_LEN		64

#define ICE_MIN_MSIX		2

#define ICE_FDIR_MSIX		1

#define ICE_NO_VSI		0xffff

#define ICE_VSI_MAP_CONTIG	0

#define ICE_VSI_MAP_SCATTER	1
@@ -94,6 +98,7 @@ extern const char ice_drv_ver[]; 
#define ICE_TX_DESC(R, i) (&(((struct ice_tx_desc *)((R)->desc))[i]))

#define ICE_RX_DESC(R, i) (&(((union ice_32b_rx_flex_desc *)((R)->desc))[i]))

#define ICE_TX_CTX_DESC(R, i) (&(((struct ice_tx_ctx_desc *)((R)->desc))[i]))

#define ICE_TX_FDIRDESC(R, i) (&(((struct ice_fltr_desc *)((R)->desc))[i]))



/* Macro for each VSI in a PF */

#define ice_for_each_vsi(pf, i) \
@@ -214,6 +219,7 @@ enum ice_state { 
	__ICE_CFG_BUSY,

	__ICE_SERVICE_SCHED,

	__ICE_SERVICE_DIS,

	__ICE_FD_FLUSH_REQ,

	__ICE_OICR_INTR_DIS,		/* Global OICR interrupt disabled */

	__ICE_MDD_VF_PRINT_PENDING,	/* set when MDD event handle */

	__ICE_VF_RESETS_DISABLED,	/* disable resets during ice_remove */
@@ -257,6 +263,8 @@ struct ice_vsi { 
	s16 vf_id;			/* VF ID for SR-IOV VSIs */



	u16 ethtype;			/* Ethernet protocol for pause frame */

	u16 num_gfltr;

	u16 num_bfltr;



	/* RSS config */

	u16 rss_table_size;	/* HW RSS table size */
@@ -265,6 +273,14 @@ struct ice_vsi { 
	u8 *rss_lut_user;	/* User configured lookup table entries */

	u8 rss_lut_type;	/* used to configure Get/Set RSS LUT AQ call */



	/* aRFS members only allocated for the PF VSI */

#define ICE_MAX_ARFS_LIST	1024

#define ICE_ARFS_LST_MASK	(ICE_MAX_ARFS_LIST - 1)

	struct hlist_head *arfs_fltr_list;

	struct ice_arfs_active_fltr_cntrs *arfs_fltr_cntrs;

	spinlock_t arfs_lock;	/* protects aRFS hash table and filter state */

	atomic_t *arfs_last_fltr_id;



	u16 max_frame;

	u16 rx_buf_len;
@@ -339,6 +355,7 @@ enum ice_pf_flags { 
	ICE_FLAG_SRIOV_CAPABLE,

	ICE_FLAG_DCB_CAPABLE,

	ICE_FLAG_DCB_ENA,

	ICE_FLAG_FD_ENA,

	ICE_FLAG_ADV_FEATURES,

	ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA,

	ICE_FLAG_NO_MEDIA,
@@ -367,6 +384,8 @@ struct ice_pf { 
	 */

	u16 sriov_base_vector;



	u16 ctrl_vsi_idx;		/* control VSI index in pf->vsi array */



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

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

	/* Virtchnl/SR-IOV config info */
@@ -505,8 +524,27 @@ static inline struct ice_vsi *ice_get_main_vsi(struct ice_pf *pf) 
	return NULL;

}



/**

 * ice_get_ctrl_vsi - Get the control VSI

 * @pf: PF instance

 */

static inline struct ice_vsi *ice_get_ctrl_vsi(struct ice_pf *pf)

{

	/* if pf->ctrl_vsi_idx is ICE_NO_VSI, control VSI was not set up */

	if (!pf->vsi || pf->ctrl_vsi_idx == ICE_NO_VSI)

		return NULL;



	return pf->vsi[pf->ctrl_vsi_idx];

}



#define ICE_FD_STAT_CTR_BLOCK_COUNT	256

#define ICE_FD_STAT_PF_IDX(base_idx) \

			((base_idx) * ICE_FD_STAT_CTR_BLOCK_COUNT)

#define ICE_FD_SB_STAT_IDX(base_idx) ICE_FD_STAT_PF_IDX(base_idx)



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);

void ice_set_ethtool_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);
@@ -530,7 +568,22 @@ int ice_schedule_reset(struct ice_pf *pf, enum ice_reset_req reset); 
void ice_print_link_msg(struct ice_vsi *vsi, bool isup);

const char *ice_stat_str(enum ice_status stat_err);

const char *ice_aq_str(enum ice_aq_err aq_err);

int

ice_fdir_write_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input, bool add,

		    bool is_tun);

void ice_vsi_manage_fdir(struct ice_vsi *vsi, bool ena);

int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd);

int ice_del_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd);

int ice_get_ethtool_fdir_entry(struct ice_hw *hw, struct ethtool_rxnfc *cmd);

int

ice_get_fdir_fltr_ids(struct ice_hw *hw, struct ethtool_rxnfc *cmd,

		      u32 *rule_locs);

void ice_fdir_release_flows(struct ice_hw *hw);

void ice_fdir_replay_flows(struct ice_hw *hw);

void ice_fdir_replay_fltrs(struct ice_pf *pf);

int ice_fdir_create_dflt_rules(struct ice_pf *pf);

int ice_open(struct net_device *netdev);

int ice_stop(struct net_device *netdev);

void ice_service_task_schedule(struct ice_pf *pf);



#endif /* _ICE_H_ */

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

+33 −1
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ struct ice_aqc_list_caps_elem { 
#define ICE_AQC_CAPS_RXQS				0x0041

#define ICE_AQC_CAPS_TXQS				0x0042

#define ICE_AQC_CAPS_MSIX				0x0043

#define ICE_AQC_CAPS_FD					0x0045

#define ICE_AQC_CAPS_MAX_MTU				0x0047



	u8 major_ver;
@@ -232,6 +233,11 @@ struct ice_aqc_get_sw_cfg_resp { 
 */

#define ICE_AQC_RES_TYPE_VSI_LIST_REP			0x03

#define ICE_AQC_RES_TYPE_VSI_LIST_PRUNE			0x04

#define ICE_AQC_RES_TYPE_FDIR_COUNTER_BLOCK		0x21

#define ICE_AQC_RES_TYPE_FDIR_GUARANTEED_ENTRIES	0x22

#define ICE_AQC_RES_TYPE_FDIR_SHARED_ENTRIES		0x23

#define ICE_AQC_RES_TYPE_FD_PROF_BLDR_PROFID		0x58

#define ICE_AQC_RES_TYPE_FD_PROF_BLDR_TCAM		0x59

#define ICE_AQC_RES_TYPE_HASH_PROF_BLDR_PROFID		0x60

#define ICE_AQC_RES_TYPE_HASH_PROF_BLDR_TCAM		0x61
@@ -240,6 +246,9 @@ struct ice_aqc_get_sw_cfg_resp { 


#define ICE_AQC_RES_TYPE_FLAG_DEDICATED			0x00



#define ICE_AQC_RES_TYPE_S	0

#define ICE_AQC_RES_TYPE_M	(0x07F << ICE_AQC_RES_TYPE_S)



/* Allocate Resources command (indirect 0x0208)

 * Free Resources command (indirect 0x0209)

 */
@@ -1059,6 +1068,25 @@ struct ice_aqc_set_phy_cfg_data { 
	u8 rsvd1;

};



/* Set MAC Config command data structure (direct 0x0603) */

struct ice_aqc_set_mac_cfg {

	__le16 max_frame_size;

	u8 params;

#define ICE_AQ_SET_MAC_PACE_S		3

#define ICE_AQ_SET_MAC_PACE_M		(0xF << ICE_AQ_SET_MAC_PACE_S)

#define ICE_AQ_SET_MAC_PACE_TYPE_M	BIT(7)

#define ICE_AQ_SET_MAC_PACE_TYPE_RATE	0

#define ICE_AQ_SET_MAC_PACE_TYPE_FIXED	ICE_AQ_SET_MAC_PACE_TYPE_M

	u8 tx_tmr_priority;

	__le16 tx_tmr_value;

	__le16 fc_refresh_threshold;

	u8 drop_opts;

#define ICE_AQ_SET_MAC_AUTO_DROP_MASK		BIT(0)

#define ICE_AQ_SET_MAC_AUTO_DROP_NONE		0

#define ICE_AQ_SET_MAC_AUTO_DROP_BLOCKING_PKTS	BIT(0)

	u8 reserved[7];

};



/* Restart AN command data structure (direct 0x0605)

 * Also used for response, with only the lport_num field present.

 */
@@ -1675,10 +1703,12 @@ struct ice_pkg_ver { 
};



#define ICE_PKG_NAME_SIZE	32

#define ICE_SEG_NAME_SIZE	28



struct ice_aqc_get_pkg_info {

	struct ice_pkg_ver ver;

	char name[ICE_PKG_NAME_SIZE];

	char name[ICE_SEG_NAME_SIZE];

	__le32 track_id;

	u8 is_in_nvm;

	u8 is_active;

	u8 is_active_at_boot;
@@ -1765,6 +1795,7 @@ struct ice_aq_desc { 
		struct ice_aqc_download_pkg download_pkg;

		struct ice_aqc_set_mac_lb set_mac_lb;

		struct ice_aqc_alloc_free_res_cmd sw_res_ctrl;

		struct ice_aqc_set_mac_cfg set_mac_cfg;

		struct ice_aqc_set_event_mask set_event_mask;

		struct ice_aqc_get_link_status get_link_status;

		struct ice_aqc_event_lan_overflow lan_overflow;
@@ -1861,6 +1892,7 @@ enum ice_adminq_opc { 
	/* PHY commands */

	ice_aqc_opc_get_phy_caps			= 0x0600,

	ice_aqc_opc_set_phy_cfg				= 0x0601,

	ice_aqc_opc_set_mac_cfg				= 0x0603,

	ice_aqc_opc_restart_an				= 0x0605,

	ice_aqc_opc_get_link_status			= 0x0607,

	ice_aqc_opc_set_event_mask			= 0x0613,

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

0 → 100644
+663 −0

File added.

Preview size limit exceeded, changes collapsed.

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

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

/* Copyright (C) 2018-2020, Intel Corporation. */



#ifndef _ICE_ARFS_H_

#define _ICE_ARFS_H_

enum ice_arfs_fltr_state {

	ICE_ARFS_INACTIVE,

	ICE_ARFS_ACTIVE,

	ICE_ARFS_TODEL,

};



struct ice_arfs_entry {

	struct ice_fdir_fltr fltr_info;

	struct hlist_node list_entry;

	u64 time_activated;	/* only valid for UDP flows */

	u32 flow_id;

	/* fltr_state = 0 - ICE_ARFS_INACTIVE:

	 *	filter needs to be updated or programmed in HW.

	 * fltr_state = 1 - ICE_ARFS_ACTIVE:

	 *	filter is active and programmed in HW.

	 * fltr_state = 2 - ICE_ARFS_TODEL:

	 *	filter has been deleted from HW and needs to be removed from

	 *	the aRFS hash table.

	 */

	u8 fltr_state;

};



struct ice_arfs_entry_ptr {

	struct ice_arfs_entry *arfs_entry;

	struct hlist_node list_entry;

};



struct ice_arfs_active_fltr_cntrs {

	atomic_t active_tcpv4_cnt;

	atomic_t active_tcpv6_cnt;

	atomic_t active_udpv4_cnt;

	atomic_t active_udpv6_cnt;

};



#ifdef CONFIG_RFS_ACCEL

int

ice_rx_flow_steer(struct net_device *netdev, const struct sk_buff *skb,

		  u16 rxq_idx, u32 flow_id);

void ice_clear_arfs(struct ice_vsi *vsi);

void ice_free_cpu_rx_rmap(struct ice_vsi *vsi);

void ice_init_arfs(struct ice_vsi *vsi);

void ice_sync_arfs_fltrs(struct ice_pf *pf);

int ice_set_cpu_rx_rmap(struct ice_vsi *vsi);

void ice_remove_arfs(struct ice_pf *pf);

void ice_rebuild_arfs(struct ice_pf *pf);

bool

ice_is_arfs_using_perfect_flow(struct ice_hw *hw,

			       enum ice_fltr_ptype flow_type);

#else

#define ice_sync_arfs_fltrs(pf) do {} while (0)

#define ice_init_arfs(vsi) do {} while (0)

#define ice_clear_arfs(vsi) do {} while (0)

#define ice_remove_arfs(pf) do {} while (0)

#define ice_free_cpu_rx_rmap(vsi) do {} while (0)

#define ice_rebuild_arfs(pf) do {} while (0)



static inline int ice_set_cpu_rx_rmap(struct ice_vsi __always_unused *vsi)

{

	return 0;

}



static inline int

ice_rx_flow_steer(struct net_device __always_unused *netdev,

		  const struct sk_buff __always_unused *skb,

		  u16 __always_unused rxq_idx, u32 __always_unused flow_id)

{

	return -EOPNOTSUPP;

}



static inline bool

ice_is_arfs_using_perfect_flow(struct ice_hw __always_unused *hw,

			       enum ice_fltr_ptype __always_unused flow_type)

{

	return false;

}

#endif /* CONFIG_RFS_ACCEL */

#endif /* _ICE_ARFS_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE