Commit 311c13dd 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/nex 


t-queue

Tony Nguyen says:

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

Wojciech Drewek says:

This series adds support for adding/removing advanced switch filters
in ice driver. Advanced filters are building blocks for HW acceleration
of TC orchestration. Add ndo_setup_tc callback implementation for PF and
VF port representors (when device is configured in switchdev mode).

Define dummy packet headers to allow adding advanced rules in HW.
Supported headers, and thus filters, are:
- MAC + IPv4 + UDP
- MAC + VLAN + IPv4 + UDP
- MAC + IPv4 + TCP
- MAC + VLAN + IPv4 + TCP
- MAC + IPv6 + UDP
- MAC + VLAN + IPv6 + UDP
- MAC + IPv6 + TCP
- MAC + VLAN + IPv6 + TCP
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e679198b 7fde6d8b

drivers/net/ethernet/intel/ice/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ ice-y := ice_main.o \ 
	 ice_fw_update.o \

	 ice_lag.o	\

	 ice_ethtool.o  \

	 ice_repr.o

	 ice_repr.o	\

	 ice_tc_lib.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

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

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include "ice_xsk.h"

#include "ice_arfs.h"

#include "ice_repr.h"

#include "ice_eswitch.h"

#include "ice_lag.h"



#define ICE_BAR0		0
@@ -400,6 +401,7 @@ enum ice_pf_flags { 
	ICE_FLAG_PTP,			/* PTP is enabled by software */

	ICE_FLAG_AUX_ENA,

	ICE_FLAG_ADV_FEATURES,

	ICE_FLAG_CLS_FLOWER,

	ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA,

	ICE_FLAG_TOTAL_PORT_SHUTDOWN_ENA,

	ICE_FLAG_NO_MEDIA,
@@ -512,6 +514,8 @@ struct ice_pf { 
	int aux_idx;

	u32 sw_int_count;



	struct hlist_head tc_flower_fltr_list;



	__le64 nvm_phy_type_lo; /* NVM PHY type low */

	__le64 nvm_phy_type_hi; /* NVM PHY type high */

	struct ice_link_default_override_tlv link_dflt_override;

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

+57 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ struct ice_aqc_get_sw_cfg_resp_elem { 
 */

#define ICE_AQC_RES_TYPE_VSI_LIST_REP			0x03

#define ICE_AQC_RES_TYPE_VSI_LIST_PRUNE			0x04

#define ICE_AQC_RES_TYPE_RECIPE				0x05

#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
@@ -241,6 +242,7 @@ struct ice_aqc_get_sw_cfg_resp_elem { 
#define ICE_AQC_RES_TYPE_HASH_PROF_BLDR_PROFID		0x60

#define ICE_AQC_RES_TYPE_HASH_PROF_BLDR_TCAM		0x61



#define ICE_AQC_RES_TYPE_FLAG_SHARED			BIT(7)

#define ICE_AQC_RES_TYPE_FLAG_SCAN_BOTTOM		BIT(12)

#define ICE_AQC_RES_TYPE_FLAG_IGNORE_INDEX		BIT(13)
@@ -474,6 +476,53 @@ struct ice_aqc_vsi_props { 


#define ICE_MAX_NUM_RECIPES 64



/* Add/Get Recipe (indirect 0x0290/0x0292) */

struct ice_aqc_add_get_recipe {

	__le16 num_sub_recipes;	/* Input in Add cmd, Output in Get cmd */

	__le16 return_index;	/* Input, used for Get cmd only */

	u8 reserved[4];

	__le32 addr_high;

	__le32 addr_low;

};



struct ice_aqc_recipe_content {

	u8 rid;

#define ICE_AQ_RECIPE_ID_IS_ROOT	BIT(7)

#define ICE_AQ_SW_ID_LKUP_IDX		0

	u8 lkup_indx[5];

#define ICE_AQ_RECIPE_LKUP_IGNORE	BIT(7)

#define ICE_AQ_SW_ID_LKUP_MASK		0x00FF

	__le16 mask[5];

	u8 result_indx;

#define ICE_AQ_RECIPE_RESULT_DATA_S	0

#define ICE_AQ_RECIPE_RESULT_DATA_M	(0x3F << ICE_AQ_RECIPE_RESULT_DATA_S)

#define ICE_AQ_RECIPE_RESULT_EN		BIT(7)

	u8 rsvd0[3];

	u8 act_ctrl_join_priority;

	u8 act_ctrl_fwd_priority;

	u8 act_ctrl;

#define ICE_AQ_RECIPE_ACT_INV_ACT	BIT(2)

	u8 rsvd1;

	__le32 dflt_act;

};



struct ice_aqc_recipe_data_elem {

	u8 recipe_indx;

	u8 resp_bits;

	u8 rsvd0[2];

	u8 recipe_bitmap[8];

	u8 rsvd1[4];

	struct ice_aqc_recipe_content content;

	u8 rsvd2[20];

};



/* Set/Get Recipes to Profile Association (direct 0x0291/0x0293) */

struct ice_aqc_recipe_to_profile {

	__le16 profile_id;

	u8 rsvd[6];

	DECLARE_BITMAP(recipe_assoc, ICE_MAX_NUM_RECIPES);

};



/* Add/Update/Remove/Get switch rules (indirect 0x02A0, 0x02A1, 0x02A2, 0x02A3)

 */

struct ice_aqc_sw_rules {
@@ -1936,6 +1985,8 @@ struct ice_aq_desc { 
		struct ice_aqc_set_port_id_led set_port_id_led;

		struct ice_aqc_get_sw_cfg get_sw_conf;

		struct ice_aqc_sw_rules sw_rules;

		struct ice_aqc_add_get_recipe add_get_recipe;

		struct ice_aqc_recipe_to_profile recipe_to_profile;

		struct ice_aqc_get_topo get_topo;

		struct ice_aqc_sched_elem_cmd sched_elem_cmd;

		struct ice_aqc_query_txsched_res query_sched_res;
@@ -2044,6 +2095,12 @@ enum ice_adminq_opc { 
	ice_aqc_opc_update_vsi				= 0x0211,

	ice_aqc_opc_free_vsi				= 0x0213,



	/* recipe commands */

	ice_aqc_opc_add_recipe				= 0x0290,

	ice_aqc_opc_recipe_to_profile			= 0x0291,

	ice_aqc_opc_get_recipe				= 0x0292,

	ice_aqc_opc_get_recipe_to_profile		= 0x0293,



	/* switch rules population commands */

	ice_aqc_opc_add_sw_rules			= 0x02A0,

	ice_aqc_opc_update_sw_rules			= 0x02A1,

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

+34 −8
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw) 
		return ICE_ERR_NO_MEMORY;



	INIT_LIST_HEAD(&sw->vsi_list_map_head);

	sw->prof_res_bm_init = 0;



	status = ice_init_def_sw_recp(hw);

	if (status) {
@@ -594,17 +595,42 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) 
		list_del(&v_pos_map->list_entry);

		devm_kfree(ice_hw_to_dev(hw), v_pos_map);

	}

	recps = hw->switch_info->recp_list;

	for (i = 0; i < ICE_SW_LKUP_LAST; i++) {

		struct ice_fltr_mgmt_list_entry *lst_itr, *tmp_entry;

	recps = sw->recp_list;

	for (i = 0; i < ICE_MAX_NUM_RECIPES; i++) {

		struct ice_recp_grp_entry *rg_entry, *tmprg_entry;



		recps[i].root_rid = i;

		list_for_each_entry_safe(rg_entry, tmprg_entry,

					 &recps[i].rg_list, l_entry) {

			list_del(&rg_entry->l_entry);

			devm_kfree(ice_hw_to_dev(hw), rg_entry);

		}



		if (recps[i].adv_rule) {

			struct ice_adv_fltr_mgmt_list_entry *tmp_entry;

			struct ice_adv_fltr_mgmt_list_entry *lst_itr;



			mutex_destroy(&recps[i].filt_rule_lock);

			list_for_each_entry_safe(lst_itr, tmp_entry,

					 &recps[i].filt_rules, list_entry) {

						 &recps[i].filt_rules,

						 list_entry) {

				list_del(&lst_itr->list_entry);

				devm_kfree(ice_hw_to_dev(hw), lst_itr->lkups);

				devm_kfree(ice_hw_to_dev(hw), lst_itr);

			}

		} else {

			struct ice_fltr_mgmt_list_entry *lst_itr, *tmp_entry;



			mutex_destroy(&recps[i].filt_rule_lock);

			list_for_each_entry_safe(lst_itr, tmp_entry,

						 &recps[i].filt_rules,

						 list_entry) {

				list_del(&lst_itr->list_entry);

				devm_kfree(ice_hw_to_dev(hw), lst_itr);

			}

		}

		if (recps[i].root_buf)

			devm_kfree(ice_hw_to_dev(hw), recps[i].root_buf);

	}

	ice_rm_all_sw_replay_rule_info(hw);

	devm_kfree(ice_hw_to_dev(hw), sw->recp_list);

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

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "ice_fltr.h"

#include "ice_repr.h"

#include "ice_devlink.h"

#include "ice_tc_lib.h"



/**

 * ice_eswitch_setup_env - configure switchdev HW filters
@@ -645,6 +646,8 @@ int ice_eswitch_rebuild(struct ice_pf *pf) 


	ice_eswitch_remap_rings_to_vectors(pf);



	ice_replay_tc_fltrs(pf);



	status = ice_vsi_open(ctrl_vsi);

	if (status)

		return status;