Commit 148beb61 authored by Henry Tieman's avatar Henry Tieman Committed by Jeff Kirsher
Browse files

ice: Initialize Flow Director resources 



Flow Director allows for redirection based on ntuple rules. Rules are
programmed using the ethtool set-ntuple interface. Supported actions are
redirect to queue and drop.

Setup the initial framework to process Flow Director filters. Create and
allocate resources to manage and program filters to the hardware. Filters
are processed via a sideband interface; a control VSI is created to manage
communication and process requests through the sideband. Upon allocation of
resources, update the hardware tables to accept perfect filters.

Signed-off-by: default avatarHenry Tieman <henry.w.tieman@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 65ece6de

drivers/net/ethernet/intel/ice/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 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	\

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

+24 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "ice_sched.h"

#include "ice_virtchnl_pf.h"

#include "ice_sriov.h"

#include "ice_fdir.h"

#include "ice_xsk.h"



extern const char ice_drv_ver[];
@@ -66,6 +67,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
@@ -257,6 +259,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 */
@@ -339,6 +343,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 +372,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 +512,22 @@ 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];

}



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,6 +551,9 @@ 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);

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

void ice_fdir_release_flows(struct ice_hw *hw);

int ice_fdir_create_dflt_rules(struct ice_pf *pf);

int ice_open(struct net_device *netdev);

int ice_stop(struct net_device *netdev);

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

+9 −0
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)

 */

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

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) 
	 */

	switch (vsi->type) {

	case ICE_VSI_LB:

	case ICE_VSI_CTRL:

	case ICE_VSI_PF:

		tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF;

		break;

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

+36 −0
Original line number Diff line number Diff line
@@ -653,6 +653,10 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 
	if (status)

		goto err_unroll_cqinit;



	/* Set bit to enable Flow Director filters */

	wr32(hw, PFQF_FD_ENA, PFQF_FD_ENA_FD_ENA_M);

	INIT_LIST_HEAD(&hw->fdir_list_head);



	ice_clear_pxe_mode(hw);



	status = ice_init_nvm(hw);
@@ -741,6 +745,10 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 
	status = ice_aq_manage_mac_read(hw, mac_buf, mac_buf_len, NULL);

	devm_kfree(ice_hw_to_dev(hw), mac_buf);



	if (status)

		goto err_unroll_fltr_mgmt_struct;

	/* Obtain counter base index which would be used by flow director */

	status = ice_alloc_fd_res_cntr(hw, &hw->fd_ctr_base);

	if (status)

		goto err_unroll_fltr_mgmt_struct;

	status = ice_init_hw_tbls(hw);
@@ -770,6 +778,7 @@ err_unroll_cqinit: 
 */

void ice_deinit_hw(struct ice_hw *hw)

{

	ice_free_fd_res_cntr(hw, hw->fd_ctr_base);

	ice_cleanup_fltr_mgmt_struct(hw);



	ice_sched_cleanup_all(hw);
@@ -1680,6 +1689,33 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count, 
				  "%s: msix_vector_first_id = %d\n", prefix,

				  caps->msix_vector_first_id);

			break;

		case ICE_AQC_CAPS_FD:

			if (dev_p) {

				dev_p->num_flow_director_fltr = number;

				ice_debug(hw, ICE_DBG_INIT,

					  "%s: num_flow_director_fltr = %d\n",

					  prefix,

					  dev_p->num_flow_director_fltr);

			}

			if (func_p) {

				u32 reg_val, val;



				reg_val = rd32(hw, GLQF_FD_SIZE);

				val = (reg_val & GLQF_FD_SIZE_FD_GSIZE_M) >>

				      GLQF_FD_SIZE_FD_GSIZE_S;

				func_p->fd_fltr_guar =

				      ice_get_num_per_func(hw, val);

				val = (reg_val & GLQF_FD_SIZE_FD_BSIZE_M) >>

				      GLQF_FD_SIZE_FD_BSIZE_S;

				func_p->fd_fltr_best_effort = val;

				ice_debug(hw, ICE_DBG_INIT,

					  "%s: fd_fltr_guar = %d\n",

					  prefix, func_p->fd_fltr_guar);

				ice_debug(hw, ICE_DBG_INIT,

					  "%s: fd_fltr_best_effort = %d\n",

					  prefix, func_p->fd_fltr_best_effort);

			}

			break;

		case ICE_AQC_CAPS_MAX_MTU:

			caps->max_mtu = number;

			ice_debug(hw, ICE_DBG_INIT, "%s: max_mtu = %d\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE