net/ice/base: support eCPRI over MAC type 0 flow
This patch adds extracting field for flow type eCPRI over mac message type 0 and field PC_ID which is used for FDIR/RSS packet steering. This patch also removes redundant hdr bitmask ops for PPPOE hdr. Signed-off-by: Yahui Cao <yahui.cao@intel.com> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> Acked-by: Qiming Yang <qiming.yang@intel.com>
This commit is contained in:
Qi Zhang
Ferruh Yigit
parent
cb71192486
commit
4f667bb015
@ -305,6 +305,13 @@ static const u8 ice_fdir_non_ip_l2_pkt[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
|
||||
static const u8 ice_fdir_ecpri_tp0_pkt[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xAE, 0xFE, 0x10, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
};
|
||||
|
||||
static const u8 ice_fdir_tcpv6_pkt[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x86, 0xDD, 0x60, 0x00,
|
||||
@ -634,6 +641,11 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
|
||||
sizeof(ice_fdir_udp4_vxlan_pkt), ice_fdir_udp4_vxlan_pkt,
|
||||
sizeof(ice_fdir_udp4_vxlan_pkt), ice_fdir_udp4_vxlan_pkt,
|
||||
},
|
||||
{
|
||||
ICE_FLTR_PTYPE_NONF_ECPRI_TP0,
|
||||
sizeof(ice_fdir_ecpri_tp0_pkt), ice_fdir_ecpri_tp0_pkt,
|
||||
sizeof(ice_fdir_ecpri_tp0_pkt), ice_fdir_ecpri_tp0_pkt,
|
||||
},
|
||||
{
|
||||
ICE_FLTR_PTYPE_NONF_IPV6_TCP,
|
||||
sizeof(ice_fdir_tcpv6_pkt), ice_fdir_tcpv6_pkt,
|
||||
@ -1238,6 +1250,10 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
|
||||
ice_pkt_insert_u16(loc, ICE_MAC_ETHTYPE_OFFSET,
|
||||
input->ext_data.ether_type);
|
||||
break;
|
||||
case ICE_FLTR_PTYPE_NONF_ECPRI_TP0:
|
||||
ice_pkt_insert_u16(loc, ICE_ECPRI_TP0_PC_ID_OFFSET,
|
||||
input->ecpri_data.pc_id);
|
||||
break;
|
||||
case ICE_FLTR_PTYPE_NONF_IPV6_TCP:
|
||||
ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,
|
||||
input->ip.v6.src_ip);
|
||||
|
||||
@ -56,6 +56,7 @@
|
||||
#define ICE_IPV4_NAT_T_ESP_SPI_OFFSET 42
|
||||
#define ICE_IPV6_NAT_T_ESP_SPI_OFFSET 62
|
||||
#define ICE_IPV4_VXLAN_VNI_OFFSET 45
|
||||
#define ICE_ECPRI_TP0_PC_ID_OFFSET 18
|
||||
|
||||
#define ICE_FDIR_MAX_FLTRS 16384
|
||||
|
||||
@ -168,6 +169,10 @@ struct ice_fdir_udp_vxlan {
|
||||
__be32 vni; /* 8 bits reserved, always be zero */
|
||||
};
|
||||
|
||||
struct ice_fdir_ecpri {
|
||||
__be16 pc_id;
|
||||
};
|
||||
|
||||
struct ice_fdir_extra {
|
||||
u8 dst_mac[ETH_ALEN]; /* dest MAC address */
|
||||
u8 src_mac[ETH_ALEN]; /* src MAC address */
|
||||
@ -204,6 +209,9 @@ struct ice_fdir_fltr {
|
||||
struct ice_fdir_l2tpv3 l2tpv3_data;
|
||||
struct ice_fdir_l2tpv3 l2tpv3_mask;
|
||||
|
||||
struct ice_fdir_ecpri ecpri_data;
|
||||
struct ice_fdir_ecpri ecpri_mask;
|
||||
|
||||
struct ice_fdir_extra ext_data;
|
||||
struct ice_fdir_extra ext_mask;
|
||||
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
#define ICE_FLOW_FLD_SZ_AH_SPI 4
|
||||
#define ICE_FLOW_FLD_SZ_NAT_T_ESP_SPI 4
|
||||
#define ICE_FLOW_FLD_SZ_VXLAN_VNI 4
|
||||
#define ICE_FLOW_FLD_SZ_ECPRI_TP0_PC_ID 2
|
||||
|
||||
/* Describe properties of a protocol header field */
|
||||
struct ice_flow_field_info {
|
||||
@ -193,6 +194,10 @@ struct ice_flow_field_info ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {
|
||||
/* ICE_FLOW_FIELD_IDX_VXLAN_VNI */
|
||||
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_VXLAN, 12,
|
||||
ICE_FLOW_FLD_SZ_VXLAN_VNI),
|
||||
/* ECPRI_TP0 */
|
||||
/* ICE_FLOW_FIELD_IDX_ECPRI_TP0_PC_ID */
|
||||
ICE_FLOW_FLD_INFO(ICE_FLOW_SEG_HDR_ECPRI_TP0, 4,
|
||||
ICE_FLOW_FLD_SZ_ECPRI_TP0_PC_ID),
|
||||
};
|
||||
|
||||
/* Bitmaps indicating relevant packet types for a particular protocol header
|
||||
@ -202,7 +207,7 @@ struct ice_flow_field_info ice_flds_info[ICE_FLOW_FIELD_IDX_MAX] = {
|
||||
static const u32 ice_ptypes_mac_ofos[] = {
|
||||
0xFDC00846, 0xBFBF7F7E, 0xF70001DF, 0xFEFDFDFB,
|
||||
0x0000077E, 0x000003FF, 0x00000000, 0x00000000,
|
||||
0x00400000, 0x03FFF000, 0xFFFFFFE0, 0x00000307,
|
||||
0x00400000, 0x03FFF000, 0xFFFFFFE0, 0x00000707,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
@ -694,6 +699,17 @@ static const u32 ice_ptypes_gtpu_no_ip[] = {
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
};
|
||||
|
||||
static const u32 ice_ptypes_ecpri_tp0[] = {
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000400,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
0x00000000, 0x00000000, 0x00000000, 0x00000000,
|
||||
};
|
||||
|
||||
/* Manage parameters and info. used during the creation of a flow profile */
|
||||
struct ice_flow_prof_params {
|
||||
enum ice_block blk;
|
||||
@ -718,7 +734,8 @@ struct ice_flow_prof_params {
|
||||
ICE_FLOW_SEG_HDR_GTPC_TEID | ICE_FLOW_SEG_HDR_GTPU | \
|
||||
ICE_FLOW_SEG_HDR_PFCP_SESSION | ICE_FLOW_SEG_HDR_L2TPV3 | \
|
||||
ICE_FLOW_SEG_HDR_ESP | ICE_FLOW_SEG_HDR_AH | \
|
||||
ICE_FLOW_SEG_HDR_NAT_T_ESP | ICE_FLOW_SEG_HDR_GTPU_NON_IP)
|
||||
ICE_FLOW_SEG_HDR_NAT_T_ESP | ICE_FLOW_SEG_HDR_GTPU_NON_IP | \
|
||||
ICE_FLOW_SEG_HDR_ECPRI_TP0)
|
||||
|
||||
#define ICE_FLOW_SEG_HDRS_L2_MASK \
|
||||
(ICE_FLOW_SEG_HDR_ETH | ICE_FLOW_SEG_HDR_VLAN)
|
||||
@ -848,8 +865,8 @@ ice_flow_proc_seg_hdrs(struct ice_flow_prof_params *params)
|
||||
ICE_FLOW_PTYPE_MAX);
|
||||
}
|
||||
|
||||
if (hdrs & ICE_FLOW_SEG_HDR_PPPOE) {
|
||||
src = (const ice_bitmap_t *)ice_ptypes_pppoe;
|
||||
if (hdrs & ICE_FLOW_SEG_HDR_ECPRI_TP0) {
|
||||
src = (const ice_bitmap_t *)ice_ptypes_ecpri_tp0;
|
||||
ice_and_bitmap(params->ptypes, params->ptypes, src,
|
||||
ICE_FLOW_PTYPE_MAX);
|
||||
}
|
||||
@ -1192,6 +1209,9 @@ ice_flow_xtract_fld(struct ice_hw *hw, struct ice_flow_prof_params *params,
|
||||
case ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI:
|
||||
prot_id = ICE_PROT_UDP_IL_OR_S;
|
||||
break;
|
||||
case ICE_FLOW_FIELD_IDX_ECPRI_TP0_PC_ID:
|
||||
prot_id = ICE_PROT_ECPRI;
|
||||
break;
|
||||
case ICE_FLOW_FIELD_IDX_ARP_SIP:
|
||||
case ICE_FLOW_FIELD_IDX_ARP_DIP:
|
||||
case ICE_FLOW_FIELD_IDX_ARP_SHA:
|
||||
|
||||
@ -183,6 +183,7 @@ enum ice_flow_seg_hdr {
|
||||
ICE_FLOW_SEG_HDR_ETH_NON_IP = 0x00800000,
|
||||
ICE_FLOW_SEG_HDR_GTPU_NON_IP = 0x01000000,
|
||||
ICE_FLOW_SEG_HDR_VXLAN = 0x02000000,
|
||||
ICE_FLOW_SEG_HDR_ECPRI_TP0 = 0x04000000,
|
||||
/* The following is an additive bit for ICE_FLOW_SEG_HDR_IPV4 and
|
||||
* ICE_FLOW_SEG_HDR_IPV6 which include the IPV4 other PTYPEs
|
||||
*/
|
||||
@ -273,6 +274,8 @@ enum ice_flow_field {
|
||||
ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI,
|
||||
/* VXLAN VNI */
|
||||
ICE_FLOW_FIELD_IDX_VXLAN_VNI,
|
||||
/* ECPRI_TP0 */
|
||||
ICE_FLOW_FIELD_IDX_ECPRI_TP0_PC_ID,
|
||||
/* The total number of enums must not exceed 64 */
|
||||
ICE_FLOW_FIELD_IDX_MAX
|
||||
};
|
||||
|
||||
@ -153,6 +153,7 @@ enum ice_prot_id {
|
||||
ICE_PROT_OSPF = 102,
|
||||
ICE_PROT_PPPOE = 103,
|
||||
ICE_PROT_L2TPV3 = 104,
|
||||
ICE_PROT_ECPRI = 105,
|
||||
ICE_PROT_ATAOE_OF = 114,
|
||||
ICE_PROT_CTRL_OF = 116,
|
||||
ICE_PROT_LLDP_OF = 117,
|
||||
|
||||
@ -324,6 +324,7 @@ enum ice_fltr_ptype {
|
||||
ICE_FLTR_PTYPE_NONF_IPV6_PFCP_NODE,
|
||||
ICE_FLTR_PTYPE_NONF_IPV6_PFCP_SESSION,
|
||||
ICE_FLTR_PTYPE_NON_IP_L2,
|
||||
ICE_FLTR_PTYPE_NONF_ECPRI_TP0,
|
||||
ICE_FLTR_PTYPE_FRAG_IPV4,
|
||||
ICE_FLTR_PTYPE_NONF_IPV6_UDP,
|
||||
ICE_FLTR_PTYPE_NONF_IPV6_TCP,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user