net/ice: refactor flow pattern parser
PATCH 1/1 net/ice: refactor flow pattern parser
Distinguish inner/outer fields. And avoid too many nested conditionals in each type's parser.
--- drivers/net/ice/ice_fdir_filter.c | 504 ++++++++++++++++-------------- 1 file changed, 269 insertions(+), 235 deletions(-)
drivers/net/ice/ice_fdir_filter.c +269 -235
@@ -1646,7 +1646,9 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask;const struct rte_flow_item_gtp *gtp_spec, *gtp_mask;const struct rte_flow_item_gtp_psc *gtp_psc_spec, *gtp_psc_mask; -uint64_t input_set =ICE_INSET_NONE ; +uint64_t inner_input_set =ICE_INSET_NONE ; +uint64_t outer_input_set =ICE_INSET_NONE ; +uint64_t *input_set;uint8_t flow_type =ICE_FLTR_PTYPE_NONF_NONE ;uint8_t ipv6_addr_mask[16 ] = {0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,
@@ -1655,289 +1657,315 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,uint32_t vtc_flow_cpu;uint16_t ether_type;enum rte_flow_item_type next_type; +bool is_outer = true; +struct ice_fdir_extra *p_ext_data; +struct ice_fdir_v4 *p_v4; +struct ice_fdir_v6 *p_v6; +for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { +if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) { + tunnel_type =ICE_FDIR_TUNNEL_TYPE_VXLAN ; +break ; + } + } + +/* This loop parse flow pattern and distinguish Non-tunnel and tunnel +* flow. For tunnel flow, reuse non-tunnel structure to track inner +* part. +* +* is_outer tunnel_type p_input_set input_set_bit data_struct +* Non-Tun Y N inner outer origin +* Tun-out Y Y outer outer outer +* Tun-in N Y inner inner origin +*/ for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Not support range" ); +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Not support range" );return -rte_errno; } item_type = item->type; + input_set = (tunnel_type && is_outer) ? + &outer_input_set : + &inner_input_set; + +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + p_v4 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v4 : + &filter->input.ip.v4; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + p_v6 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v6 : + &filter->input.ip.v6; +switch (item_type) {case RTE_FLOW_ITEM_TYPE_ETH : + flow_type =ICE_FLTR_PTYPE_NON_IP_L2 ; eth_spec = item->spec; eth_mask = item->mask; - next_type = (item +1 )->type; -if (eth_spec && eth_mask) { -if (!rte_is_zero_ether_addr (ð_mask->dst)) { - input_set |=ICE_INSET_DMAC ; -rte_memcpy (&filter->input.ext_data.dst_mac, - ð_spec->dst, -RTE_ETHER_ADDR_LEN ); - } +if (!(eth_spec && eth_mask)) +break ; -if (!rte_is_zero_ether_addr (ð_mask->src)) { - input_set |=ICE_INSET_SMAC ; -rte_memcpy (&filter->input.ext_data.src_mac, - ð_spec->src, -RTE_ETHER_ADDR_LEN ); - } + *input_set |= is_outer ?ICE_PROT_MAC_OUTER :ICE_PROT_MAC_INNER ; +if (!rte_is_zero_ether_addr (ð_mask->dst)) + *input_set |=ICE_DMAC ; +if (!rte_is_zero_ether_addr (ð_mask->src)) + *input_set |=ICE_SMAC ; -/* Ignore this field except for ICE_FLTR_PTYPE_NON_IP_L2 */ -if (eth_mask->type ==RTE_BE16 (0xffff ) && - next_type ==RTE_FLOW_ITEM_TYPE_END ) { - input_set |=ICE_INSET_ETHERTYPE ; - ether_type =rte_be_to_cpu_16 (eth_spec->type); - -if (ether_type ==RTE_ETHER_TYPE_IPV4 || - ether_type ==RTE_ETHER_TYPE_IPV6 ) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Unsupported ether_type." ); -return -rte_errno; - } - -rte_memcpy (&filter->input.ext_data.ether_type, - ð_spec->type, -sizeof (eth_spec->type)); - flow_type =ICE_FLTR_PTYPE_NON_IP_L2 ; + next_type = (item +1 )->type; +/* Ignore this field except for ICE_FLTR_PTYPE_NON_IP_L2 */ +if (eth_mask->type ==RTE_BE16 (0xffff ) && + next_type ==RTE_FLOW_ITEM_TYPE_END ) { + *input_set |=ICE_INSET_ETHERTYPE ; + ether_type =rte_be_to_cpu_16 (eth_spec->type); + +if (ether_type ==RTE_ETHER_TYPE_IPV4 || + ether_type ==RTE_ETHER_TYPE_IPV6 ) { +rte_flow_error_set (error,EINVAL , +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Unsupported ether_type." ); +return -rte_errno; } } + + p_ext_data = (tunnel_type && is_outer) ? + &filter->input.ext_data_outer : + &filter->input.ext_data; +rte_memcpy (&p_ext_data->src_mac, + ð_spec->src, +RTE_ETHER_ADDR_LEN ); +rte_memcpy (&p_ext_data->dst_mac, + ð_spec->dst, +RTE_ETHER_ADDR_LEN ); +rte_memcpy (&p_ext_data->ether_type, + ð_spec->type, +sizeof (eth_spec->type)); +break ;case RTE_FLOW_ITEM_TYPE_IPV4 : + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_OTHER ; l3 =RTE_FLOW_ITEM_TYPE_IPV4 ; ipv4_spec = item->spec; ipv4_mask = item->mask; -if (ipv4_spec && ipv4_mask) { -/* Check IPv4 mask and update input set */ -if (ipv4_mask->hdr.version_ihl || - ipv4_mask->hdr.total_length || - ipv4_mask->hdr.packet_id || - ipv4_mask->hdr.fragment_offset || - ipv4_mask->hdr.hdr_checksum) { -rte_flow_error_set (error,EINVAL , +if (!(ipv4_spec && ipv4_mask)) +break ; + +/* Check IPv4 mask and update input set */ +if (ipv4_mask->hdr.version_ihl || + ipv4_mask->hdr.total_length || + ipv4_mask->hdr.packet_id || + ipv4_mask->hdr.fragment_offset || + ipv4_mask->hdr.hdr_checksum) { +rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , item,"Invalid IPv4 mask." ); -return -rte_errno; - } -if (ipv4_mask->hdr.src_addr ==UINT32_MAX ) - input_set |= tunnel_type ? -ICE_INSET_TUN_IPV4_SRC : -ICE_INSET_IPV4_SRC ; -if (ipv4_mask->hdr.dst_addr ==UINT32_MAX ) - input_set |= tunnel_type ? -ICE_INSET_TUN_IPV4_DST : -ICE_INSET_IPV4_DST ; -if (ipv4_mask->hdr.type_of_service ==UINT8_MAX ) - input_set |=ICE_INSET_IPV4_TOS ; -if (ipv4_mask->hdr.time_to_live ==UINT8_MAX ) - input_set |=ICE_INSET_IPV4_TTL ; -if (ipv4_mask->hdr.next_proto_id ==UINT8_MAX ) - input_set |=ICE_INSET_IPV4_PROTO ; - - filter->input.ip.v4.dst_ip = - ipv4_spec->hdr.dst_addr; - filter->input.ip.v4.src_ip = - ipv4_spec->hdr.src_addr; - filter->input.ip.v4.tos = - ipv4_spec->hdr.type_of_service; - filter->input.ip.v4.ttl = - ipv4_spec->hdr.time_to_live; - filter->input.ip.v4.proto = - ipv4_spec->hdr.next_proto_id; +return -rte_errno; } - flow_type =ICE_FLTR_PTYPE_NONF_IPV4_OTHER ; +/* handle outer L3 fields */ + *input_set |= is_outer ?ICE_PROT_IPV4_OUTER :ICE_PROT_IPV4_INNER ; +if (ipv4_mask->hdr.dst_addr ==UINT32_MAX ) + *input_set |=ICE_IP_DST ; +if (ipv4_mask->hdr.src_addr ==UINT32_MAX ) + *input_set |=ICE_IP_SRC ; +if (ipv4_mask->hdr.type_of_service ==UINT8_MAX ) + *input_set |=ICE_IP_TOS ; + + p_v4 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v4 : + &filter->input.ip.v4; + p_v4->dst_ip = ipv4_spec->hdr.dst_addr; + p_v4->src_ip = ipv4_spec->hdr.src_addr; + p_v4->tos = ipv4_spec->hdr.type_of_service; +break ;case RTE_FLOW_ITEM_TYPE_IPV6 : + flow_type =ICE_FLTR_PTYPE_NONF_IPV6_OTHER ; l3 =RTE_FLOW_ITEM_TYPE_IPV6 ; ipv6_spec = item->spec; ipv6_mask = item->mask; -if (ipv6_spec && ipv6_mask) { -/* Check IPv6 mask and update input set */ -if (ipv6_mask->hdr.payload_len) { -rte_flow_error_set (error,EINVAL , +if (!(ipv6_spec && ipv6_mask)) +break ; + +/* Check IPv6 mask and update input set */ +if (ipv6_mask->hdr.payload_len) { +rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , item,"Invalid IPv6 mask" ); -return -rte_errno; - } - -if (!memcmp (ipv6_mask->hdr.src_addr, - ipv6_addr_mask, -RTE_DIM (ipv6_mask->hdr.src_addr))) - input_set |=ICE_INSET_IPV6_SRC ; -if (!memcmp (ipv6_mask->hdr.dst_addr, - ipv6_addr_mask, -RTE_DIM (ipv6_mask->hdr.dst_addr))) - input_set |=ICE_INSET_IPV6_DST ; - -if ((ipv6_mask->hdr.vtc_flow & -rte_cpu_to_be_32 (ICE_IPV6_TC_MASK )) - ==rte_cpu_to_be_32 (ICE_IPV6_TC_MASK )) - input_set |=ICE_INSET_IPV6_TC ; -if (ipv6_mask->hdr.proto ==UINT8_MAX ) - input_set |=ICE_INSET_IPV6_NEXT_HDR ; -if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) - input_set |=ICE_INSET_IPV6_HOP_LIMIT ; - -rte_memcpy (filter->input.ip.v6.dst_ip, - ipv6_spec->hdr.dst_addr,16 ); -rte_memcpy (filter->input.ip.v6.src_ip, - ipv6_spec->hdr.src_addr,16 ); - - vtc_flow_cpu = -rte_be_to_cpu_32 (ipv6_spec->hdr.vtc_flow); - filter->input.ip.v6.tc = - (uint8_t )(vtc_flow_cpu >> -ICE_FDIR_IPV6_TC_OFFSET ); - filter->input.ip.v6.proto = - ipv6_spec->hdr.proto; - filter->input.ip.v6.hlim = - ipv6_spec->hdr.hop_limits; +return -rte_errno; } - flow_type =ICE_FLTR_PTYPE_NONF_IPV6_OTHER ; + *input_set |= is_outer ?ICE_PROT_IPV6_OUTER :ICE_PROT_IPV6_INNER ; +if (!memcmp (ipv6_mask->hdr.src_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.src_addr))) + *input_set |=ICE_IP_SRC ; +if (!memcmp (ipv6_mask->hdr.dst_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.dst_addr))) + *input_set |=ICE_IP_DST ; + +if ((ipv6_mask->hdr.vtc_flow & +rte_cpu_to_be_32 (ICE_IPV6_TC_MASK )) + ==rte_cpu_to_be_32 (ICE_IPV6_TC_MASK )) + *input_set |=ICE_IP_TOS ; +if (ipv6_mask->hdr.proto ==UINT8_MAX ) + *input_set |=ICE_IP_PROTO ; +if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) + *input_set |=ICE_IP_TTL ; + +if (!memcmp (ipv6_mask->hdr.src_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.src_addr))) + *input_set |=ICE_IP_SRC ; +if (!memcmp (ipv6_mask->hdr.dst_addr, + ipv6_addr_mask, +RTE_DIM (ipv6_mask->hdr.dst_addr))) + *input_set |=ICE_IP_DST ; + +if ((ipv6_mask->hdr.vtc_flow & +rte_cpu_to_be_32 (ICE_IPV6_TC_MASK )) + ==rte_cpu_to_be_32 (ICE_IPV6_TC_MASK )) + *input_set |=ICE_IP_TOS ; +if (ipv6_mask->hdr.proto ==UINT8_MAX ) + *input_set |=ICE_IP_PROTO ; +if (ipv6_mask->hdr.hop_limits ==UINT8_MAX ) + *input_set |=ICE_IP_TTL ; + + p_v6 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v6 : + &filter->input.ip.v6; +rte_memcpy (&p_v6->dst_ip, ipv6_spec->hdr.dst_addr,16 ); +rte_memcpy (&p_v6->src_ip, ipv6_spec->hdr.src_addr,16 ); + vtc_flow_cpu =rte_be_to_cpu_32 (ipv6_spec->hdr.vtc_flow); + p_v6->tc = (uint8_t )(vtc_flow_cpu >>ICE_FDIR_IPV6_TC_OFFSET ); + p_v6->proto = ipv6_spec->hdr.proto; + p_v6->hlim = ipv6_spec->hdr.hop_limits; +break ;case RTE_FLOW_ITEM_TYPE_TCP : - tcp_spec = item->spec; - tcp_mask = item->mask; -if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) flow_type =ICE_FLTR_PTYPE_NONF_IPV4_TCP ; -else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) flow_type =ICE_FLTR_PTYPE_NONF_IPV6_TCP ; -if (tcp_spec && tcp_mask) { -/* Check TCP mask and update input set */ -if (tcp_mask->hdr.sent_seq || - tcp_mask->hdr.recv_ack || - tcp_mask->hdr.data_off || - tcp_mask->hdr.tcp_flags || - tcp_mask->hdr.rx_win || - tcp_mask->hdr.cksum || - tcp_mask->hdr.tcp_urp) { -rte_flow_error_set (error,EINVAL , + tcp_spec = item->spec; + tcp_mask = item->mask; + +if (!(tcp_spec && tcp_mask)) +break ; + +/* Check TCP mask and update input set */ +if (tcp_mask->hdr.sent_seq || + tcp_mask->hdr.recv_ack || + tcp_mask->hdr.data_off || + tcp_mask->hdr.tcp_flags || + tcp_mask->hdr.rx_win || + tcp_mask->hdr.cksum || + tcp_mask->hdr.tcp_urp) { +rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , item,"Invalid TCP mask" ); -return -rte_errno; - } +return -rte_errno; + } -if (tcp_mask->hdr.src_port ==UINT16_MAX ) - input_set |= tunnel_type ? -ICE_INSET_TUN_TCP_SRC_PORT : -ICE_INSET_TCP_SRC_PORT ; -if (tcp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |= tunnel_type ? -ICE_INSET_TUN_TCP_DST_PORT : -ICE_INSET_TCP_DST_PORT ; - -/* Get filter info */ -if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) { - filter->input.ip.v4.dst_port = - tcp_spec->hdr.dst_port; - filter->input.ip.v4.src_port = - tcp_spec->hdr.src_port; - }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { - filter->input.ip.v6.dst_port = - tcp_spec->hdr.dst_port; - filter->input.ip.v6.src_port = - tcp_spec->hdr.src_port; - } + *input_set |= is_outer ?ICE_PROT_TCP_OUTER :ICE_PROT_TCP_INNER ; +if (tcp_mask->hdr.src_port ==UINT16_MAX ) + *input_set |=ICE_SPORT ; +if (tcp_mask->hdr.dst_port ==UINT16_MAX ) + *input_set |=ICE_DPORT ; + +/* Get filter info */ +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) { + p_v4->dst_port = tcp_spec->hdr.dst_port; + p_v4->src_port = tcp_spec->hdr.src_port; + }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { + p_v6->dst_port = tcp_spec->hdr.dst_port; + p_v6->src_port = tcp_spec->hdr.src_port; } +break ;case RTE_FLOW_ITEM_TYPE_UDP : - udp_spec = item->spec; - udp_mask = item->mask; -if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP ; -else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) flow_type =ICE_FLTR_PTYPE_NONF_IPV6_UDP ; -if (udp_spec && udp_mask) { -/* Check UDP mask and update input set*/ -if (udp_mask->hdr.dgram_len || - udp_mask->hdr.dgram_cksum) { -rte_flow_error_set (error,EINVAL , + udp_spec = item->spec; + udp_mask = item->mask; + +if (!(udp_spec && udp_mask)) +break ; + +/* Check UDP mask and update input set*/ +if (udp_mask->hdr.dgram_len || + udp_mask->hdr.dgram_cksum) { +rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , item,"Invalid UDP mask" ); -return -rte_errno; - } +return -rte_errno; + } -if (udp_mask->hdr.src_port ==UINT16_MAX ) - input_set |= tunnel_type ? -ICE_INSET_TUN_UDP_SRC_PORT : -ICE_INSET_UDP_SRC_PORT ; -if (udp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |= tunnel_type ? -ICE_INSET_TUN_UDP_DST_PORT : -ICE_INSET_UDP_DST_PORT ; - -/* Get filter info */ -if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) { - filter->input.ip.v4.dst_port = - udp_spec->hdr.dst_port; - filter->input.ip.v4.src_port = - udp_spec->hdr.src_port; - }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { - filter->input.ip.v6.src_port = - udp_spec->hdr.src_port; - filter->input.ip.v6.dst_port = - udp_spec->hdr.dst_port; - } + *input_set |= is_outer ?ICE_PROT_UDP_OUTER :ICE_PROT_UDP_INNER ; +if (udp_mask->hdr.src_port ==UINT16_MAX ) + *input_set |=ICE_SPORT ; +if (udp_mask->hdr.dst_port ==UINT16_MAX ) + *input_set |=ICE_DPORT ; + +/* Get filter info */ +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) { + p_v4->dst_port = udp_spec->hdr.dst_port; + p_v4->src_port = udp_spec->hdr.src_port; + }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { + p_v6->src_port = udp_spec->hdr.src_port; + p_v6->dst_port = udp_spec->hdr.dst_port; }break ;case RTE_FLOW_ITEM_TYPE_SCTP : - sctp_spec = item->spec; - sctp_mask = item->mask; -if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) flow_type =ICE_FLTR_PTYPE_NONF_IPV4_SCTP ; -else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) flow_type =ICE_FLTR_PTYPE_NONF_IPV6_SCTP ; -if (sctp_spec && sctp_mask) { -/* Check SCTP mask and update input set */ -if (sctp_mask->hdr.cksum) { -rte_flow_error_set (error,EINVAL , + sctp_spec = item->spec; + sctp_mask = item->mask; + +if (!(sctp_spec && sctp_mask)) +break ; + +/* Check SCTP mask and update input set */ +if (sctp_mask->hdr.cksum) { +rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , item,"Invalid UDP mask" ); -return -rte_errno; - } +return -rte_errno; + } -if (sctp_mask->hdr.src_port ==UINT16_MAX ) - input_set |= tunnel_type ? -ICE_INSET_TUN_SCTP_SRC_PORT : -ICE_INSET_SCTP_SRC_PORT ; -if (sctp_mask->hdr.dst_port ==UINT16_MAX ) - input_set |= tunnel_type ? -ICE_INSET_TUN_SCTP_DST_PORT : -ICE_INSET_SCTP_DST_PORT ; - -/* Get filter info */ -if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) { - filter->input.ip.v4.dst_port = - sctp_spec->hdr.dst_port; - filter->input.ip.v4.src_port = - sctp_spec->hdr.src_port; - }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { - filter->input.ip.v6.dst_port = - sctp_spec->hdr.dst_port; - filter->input.ip.v6.src_port = - sctp_spec->hdr.src_port; - } + *input_set |= is_outer ?ICE_PROT_SCTP_OUTER :ICE_PROT_SCTP_INNER ; +if (sctp_mask->hdr.src_port ==UINT16_MAX ) + *input_set |=ICE_SPORT ; +if (sctp_mask->hdr.dst_port ==UINT16_MAX ) + *input_set |=ICE_DPORT ; + +/* Get filter info */ +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) { + p_v4->dst_port = sctp_spec->hdr.dst_port; + p_v4->src_port = sctp_spec->hdr.src_port; + }else if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) { + p_v6->dst_port = sctp_spec->hdr.dst_port; + p_v6->src_port = sctp_spec->hdr.src_port; }break ;case RTE_FLOW_ITEM_TYPE_VOID :
@@ -1946,6 +1974,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, l3 =RTE_FLOW_ITEM_TYPE_END ; vxlan_spec = item->spec; vxlan_mask = item->mask; + is_outer = false;if (vxlan_spec || vxlan_mask) { rte_flow_error_set(error, EINVAL,
@@ -1955,50 +1984,54 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,return -rte_errno; } - tunnel_type =ICE_FDIR_TUNNEL_TYPE_VXLAN ;break ;case RTE_FLOW_ITEM_TYPE_GTPU : l3 =RTE_FLOW_ITEM_TYPE_END ; gtp_spec = item->spec; gtp_mask = item->mask; + is_outer = false; -if (gtp_spec && gtp_mask) { -if (gtp_mask->v_pt_rsv_flags || - gtp_mask->msg_type || - gtp_mask->msg_len) { -rte_flow_error_set (error,EINVAL , +if (!(gtp_spec && gtp_mask)) +break ; + +if (gtp_mask->v_pt_rsv_flags || + gtp_mask->msg_type || + gtp_mask->msg_len) { +rte_flow_error_set (error,EINVAL ,RTE_FLOW_ERROR_TYPE_ITEM , item,"Invalid GTP mask" ); -return -rte_errno; - } +return -rte_errno; + } -if (gtp_mask->teid ==UINT32_MAX ) - input_set |=ICE_INSET_GTPU_TEID ; +if (gtp_mask->teid ==UINT32_MAX ) + *input_set |=ICE_INSET_GTPU_TEID ; - filter->input.gtpu_data.teid = gtp_spec->teid; - } + filter->input.gtpu_data.teid = gtp_spec->teid; tunnel_type =ICE_FDIR_TUNNEL_TYPE_GTPU ;break ;case RTE_FLOW_ITEM_TYPE_GTP_PSC : gtp_psc_spec = item->spec; gtp_psc_mask = item->mask; + is_outer = false; -if (gtp_psc_spec && gtp_psc_mask) { -if (gtp_psc_mask->qfi ==UINT8_MAX ) - input_set |=ICE_INSET_GTPU_QFI ; +if (!(gtp_psc_spec && gtp_psc_mask)) +break ; + +if (gtp_psc_mask->qfi ==UINT8_MAX ) + *input_set |=ICE_INSET_GTPU_QFI ; + + filter->input.gtpu_data.qfi = + gtp_psc_spec->qfi; - filter->input.gtpu_data.qfi = - gtp_psc_spec->qfi; - } tunnel_type =ICE_FDIR_TUNNEL_TYPE_GTPU_EH ;break ;default :rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Invalid pattern item." ); +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Invalid pattern item." );return -rte_errno; } }
@@ -2018,7 +2051,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, filter->tunnel_type = tunnel_type; filter->input.flow_type = flow_type; - filter->input_set = input_set; + filter->input_set = inner_input_set; + filter->outer_input_set = outer_input_set;return 0 ; }
Signature · 1 line
2.25.1
Hi Zhirun,
I think it is great to refactor ice fdir to differentiate inner and outer field vector in a more clear way. Thanks for your commit. It seems there still needs some effort to complete this patch.
Quoted 10 lines
-----Original Message-----
From: Yan, Zhirun <[email protected]>
Sent: Tuesday, November 17, 2020 4:45 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Cao, Yahui <[email protected]>; Wang, Xiao W <[email protected]>; Su, Simei <[email protected]>
Cc: Yan, Zhirun <[email protected]>
Subject: [PATCH v1] net/ice: refactor flow pattern parserDistinguish inner/outer fields. And avoid too many nested conditionals in each type's parser.
[Cao, Yahui]
Since this is quite a huge refactor, could you give a more detailed description in the commit message? Thanks. It would be better if you can make them a patchset.
Quoted 25 lines
Signed-off-by Zhirun Yan <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 504 ++++++++++++++++-------------- 1 file changed, 269 insertions(+), 235 deletions(-)drivers/net/ice/ice_fdir_filter.c +3
-1@@ -1646,7 +1646,9 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask;const struct rte_flow_item_gtp *gtp_spec, *gtp_mask;const struct rte_flow_item_gtp_psc *gtp_psc_spec, *gtp_psc_mask; -uint64_t input_set =ICE_INSET_NONE ; +uint64_t inner_input_set =ICE_INSET_NONE ; +uint64_t outer_input_set =ICE_INSET_NONE ; +uint64_t *input_set;uint8_t flow_type =ICE_FLTR_PTYPE_NONF_NONE ;uint8_t ipv6_addr_mask[16 ] = {0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,@@ -1655,289 +1657,315 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,uint32_t vtc_flow_cpu;uint16_t ether_type;enum rte_flow_item_type next_type;
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1669
Quoted 10 lines
drivers/net/ice/ice_fdir_filter.c +9
-0+bool is_outer = true; +struct ice_fdir_extra *p_ext_data; +struct ice_fdir_v4 *p_v4; +struct ice_fdir_v6 *p_v6; +for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { +if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) { + tunnel_type =ICE_FDIR_TUNNEL_TYPE_VXLAN ; +break ; + }
[Cao, Yahui]
You should take both of VXLAN and GTP cases into consideration
Quoted 27 lines
drivers/net/ice/ice_fdir_filter.c +17
-3+ } + +/* This loop parse flow pattern and distinguish Non-tunnel and tunnel +* flow. For tunnel flow, reuse non-tunnel structure to track inner +* part. +* +* is_outer tunnel_type p_input_set input_set_bit data_struct +* Non-Tun Y N inner outer origin +* Tun-out Y Y outer outer outer +* Tun-in N Y inner inner origin +*/ for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Not support range" ); +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Not support range" );return -rte_errno; } item_type = item->type; + input_set = (tunnel_type && is_outer) ? + &outer_input_set : + &inner_input_set;
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1703
Quoted 10 lines
drivers/net/ice/ice_fdir_filter.c +10
-0+ +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + p_v4 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v4 : + &filter->input.ip.v4; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + p_v6 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v6 : + &filter->input.ip.v6; +
[Cao, Yahui]
Why do you put p_v4 value assignment out of switch case RTE_FLOW_ITEM_TYPE_IPV4? Why do you put p_v6 value assignment out of switch case RTE_FLOW_ITEM_TYPE_IPV6?
Quoted 14 lines
drivers/net/ice/ice_fdir_filter.c +1
-8switch (item_type) {case RTE_FLOW_ITEM_TYPE_ETH : + flow_type =ICE_FLTR_PTYPE_NON_IP_L2 ; eth_spec = item->spec; eth_mask = item->mask; - next_type = (item +1 )->type; -if (eth_spec && eth_mask) { -if (!rte_is_zero_ether_addr (ð_mask->dst)) { - input_set |=ICE_INSET_DMAC ; -rte_memcpy (&filter->input.ext_data.dst_mac, - ð_spec->dst, -RTE_ETHER_ADDR_LEN ); - }
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1713
Quoted 10 lines
drivers/net/ice/ice_fdir_filter.c +3
-6+if (!(eth_spec && eth_mask)) +break ; -if (!rte_is_zero_ether_addr (ð_mask->src)) { - input_set |=ICE_INSET_SMAC ; -rte_memcpy (&filter->input.ext_data.src_mac, - ð_spec->src, -RTE_ETHER_ADDR_LEN ); - } + *input_set |= is_outer ?ICE_PROT_MAC_OUTER :ICE_PROT_MAC_INNER ;
[Cao, Yahui]ICE_PROT_XXX is internally used. You should use ICE_INSET_XXX version. The same comment applies for similar case elsewhere.
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1715
Quoted 2 lines
drivers/net/ice/ice_fdir_filter.c +2
-0+if (!rte_is_zero_ether_addr (ð_mask->dst)) + *input_set |=ICE_DMAC ;
[Cao, Yahui]
You should not use ICE_DMAC here. You should use ICE_INSET_XXX version. The same comment applies for similar case elsewhere.
Quoted 19 lines
drivers/net/ice/ice_fdir_filter.c +2
-16+if (!rte_is_zero_ether_addr (ð_mask->src)) + *input_set |=ICE_SMAC ; -/* Ignore this field except for ICE_FLTR_PTYPE_NON_IP_L2 */ -if (eth_mask->type ==RTE_BE16 (0xffff ) && - next_type ==RTE_FLOW_ITEM_TYPE_END ) { - input_set |=ICE_INSET_ETHERTYPE ; - ether_type =rte_be_to_cpu_16 (eth_spec->type); - -if (ether_type ==RTE_ETHER_TYPE_IPV4 || - ether_type ==RTE_ETHER_TYPE_IPV6 ) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Unsupported ether_type." ); -return -rte_errno; - } - - rte_memcpy(&filter->input.ext_data.ether_type,
....
Quoted 3 lines
}
--
2.25.1
PATCH 1/1 net/ice: refactor flow pattern parser
Quoted 13 lines · Cao, Yahui
Hi Zhirun,
I think it is great to refactor ice fdir to differentiate inner and outer field vector in a more clear way. Thanks for your commit. It seems there still needs some effort to complete this patch.
Quoted 8 lines
-----Original Message-----
From: Yan, Zhirun <[email protected]>
Sent: Tuesday, November 17, 2020 4:45 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Cao, Yahui <[email protected]>; Wang, Xiao W <[email protected]>; Su, Simei <[email protected]>
Cc: Yan, Zhirun <[email protected]>
Subject: [PATCH v1] net/ice: refactor flow pattern parser
Quoted 6 lines
Quoted 2 lines
Distinguish inner/outer fields. And avoid too many nested conditionals in each type's parser.
[Cao, Yahui]
Since this is quite a huge refactor, could you give a more detailed description in the commit message? Thanks. It would be better if you can make them a patchset.
Thanks Yahui, will add more details. All changes in one function.
Quoted 30 lines
Quoted 30 lines
Signed-off-by Zhirun Yan <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 504 ++++++++++++++++-------------- 1 file changed, 269 insertions(+), 235 deletions(-)drivers/net/ice/ice_fdir_filter.c +7
-1@@ -1646,7 +1646,9 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask;const struct rte_flow_item_gtp *gtp_spec, *gtp_mask;const struct rte_flow_item_gtp_psc *gtp_psc_spec, *gtp_psc_mask; -uint64_t input_set =ICE_INSET_NONE ; +uint64_t inner_input_set =ICE_INSET_NONE ; +uint64_t outer_input_set =ICE_INSET_NONE ; +uint64_t *input_set;uint8_t flow_type =ICE_FLTR_PTYPE_NONF_NONE ;uint8_t ipv6_addr_mask[16 ] = {0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,@@ -1655,289 +1657,315 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,uint32_t vtc_flow_cpu;uint16_t ether_type;enum rte_flow_item_type next_type; +bool is_outer = true; +struct ice_fdir_extra *p_ext_data; +struct ice_fdir_v4 *p_v4; +struct ice_fdir_v6 *p_v6;
Quoted 7 lines
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1669
Quoted 5 lines
drivers/net/ice/ice_fdir_filter.c +5
-0+for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { +if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) { + tunnel_type =ICE_FDIR_TUNNEL_TYPE_VXLAN ; +break ; + }[Cao, Yahui]
You should take both of VXLAN and GTP cases into consideration
Yes, will add GTP in v2.
Quoted 24 lines
Quoted 24 lines
drivers/net/ice/ice_fdir_filter.c +14
-3+ } + +/* This loop parse flow pattern and distinguish Non-tunnel and tunnel +* flow. For tunnel flow, reuse non-tunnel structure to track inner +* part. +* +* is_outer tunnel_type p_input_set input_set_bit data_struct +* Non-Tun Y N inner outer origin +* Tun-out Y Y outer outer outer +* Tun-in N Y inner inner origin +*/ for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Not support range" ); +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Not support range" );return -rte_errno; } item_type = item->type;
Quoted 17 lines
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1703
Quoted 13 lines
drivers/net/ice/ice_fdir_filter.c +13
-0+ input_set = (tunnel_type && is_outer) ? + &outer_input_set : + &inner_input_set; + +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + p_v4 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v4 : + &filter->input.ip.v4; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + p_v6 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v6 : + &filter->input.ip.v6; +[Cao, Yahui]
Why do you putp_v4value assignment out of switch caseRTE_FLOW_ITEM_TYPE_IPV4? Why do you putp_v6value assignment out of switch caseRTE_FLOW_ITEM_TYPE_IPV6?
Yes, for RTE_FLOW_ITEM_TYPE_IPV4/6, p_v4/6 assigned in each case as you say.
But this is only for L4 layer parser. For L4 layer, the p_v4/6 is the shared pointer will be used after L3 loop.
Quoted 17 lines
Quoted 17 lines
drivers/net/ice/ice_fdir_filter.c +3
-8switch (item_type) {case RTE_FLOW_ITEM_TYPE_ETH : + flow_type =ICE_FLTR_PTYPE_NON_IP_L2 ; eth_spec = item->spec; eth_mask = item->mask; - next_type = (item +1 )->type; -if (eth_spec && eth_mask) { -if (!rte_is_zero_ether_addr (ð_mask->dst)) { - input_set |=ICE_INSET_DMAC ; -rte_memcpy (&filter->input.ext_data.dst_mac, - ð_spec->dst, -RTE_ETHER_ADDR_LEN ); - } +if (!(eth_spec && eth_mask)) +break ;
Quoted 10 lines
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1713
Quoted 7 lines
drivers/net/ice/ice_fdir_filter.c +1
-6-if (!rte_is_zero_ether_addr (ð_mask->src)) { - input_set |=ICE_INSET_SMAC ; -rte_memcpy (&filter->input.ext_data.src_mac, - ð_spec->src, -RTE_ETHER_ADDR_LEN ); - } + *input_set |= is_outer ?ICE_PROT_MAC_OUTER :ICE_PROT_MAC_INNER ;[Cao, Yahui]
ICE_PROT_XXXis internally used. You should useICE_INSET_XXXversion. The same comment applies for similar case elsewhere.
How to distinguish internally used? ICE_PROT_XXX and ICE_INSET_XXX are defined in same file ice_generic_flow.h. And this kind of macro tries to introduce inner/outer bit to distinguish inner/outer, but actually it will mix field with its location. For FDIR, it seems not a good way.
There is much more cases for inner/outer and src/dst. So I try to use this line to set outer/inner bit first, and src/dst bit can be reused.
Quoted 5 lines
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1715
Quoted 2 lines
drivers/net/ice/ice_fdir_filter.c +2
-0+if (!rte_is_zero_ether_addr (ð_mask->dst)) + *input_set |=ICE_DMAC ;[Cao, Yahui]
You should not useICE_DMAChere. You should useICE_INSET_XXXversion. The same comment applies for similar case elsewhere.
I guess this part should re-design if we want to use. So I prefer not to use it.
Quoted 24 lines
Quoted 19 lines
drivers/net/ice/ice_fdir_filter.c +2
-16+if (!rte_is_zero_ether_addr (ð_mask->src)) + *input_set |=ICE_SMAC ; -/* Ignore this field except for ICE_FLTR_PTYPE_NON_IP_L2 */ -if (eth_mask->type ==RTE_BE16 (0xffff ) && - next_type ==RTE_FLOW_ITEM_TYPE_END ) { - input_set |=ICE_INSET_ETHERTYPE ; - ether_type =rte_be_to_cpu_16 (eth_spec->type); - -if (ether_type ==RTE_ETHER_TYPE_IPV4 || - ether_type ==RTE_ETHER_TYPE_IPV6 ) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Unsupported ether_type." ); -return -rte_errno; - } - - rte_memcpy(&filter->input.ext_data.ether_type,....
Quoted 3 lines
}
--
2.25.1
Signature · 2 lines
Best regards, Zhirun Yan
Quoted 150 lines
-----Original Message-----
From: Yan, Zhirun <[email protected]>
Sent: Wednesday, November 18, 2020 11:15 AM
To: Cao, Yahui <[email protected]>
Cc: [email protected]; Zhang, Qi Z <[email protected]>; Wang, Xiao W <[email protected]>; Su, Simei <[email protected]>
Subject: [PATCH v1] net/ice: refactor flow pattern parserQuoted 9 lines · Cao, Yahui
Hi Zhirun,
I think it is great to refactor ice fdir to differentiate inner and outer field vector in a more clear way. Thanks for your commit. It seems there still needs some effort to complete this patch.
Quoted 4 lines
-----Original Message-----
From: Yan, Zhirun <[email protected]>
Sent: Tuesday, November 17, 2020 4:45 PM
To: [email protected]; Zhang, Qi Z <[email protected]>; Cao, Yahui <[email protected]>; Wang, Xiao WQuoted 10 lines
Quoted 6 lines
Su, Simei <[email protected]>
Cc: Yan, Zhirun <[email protected]>
Subject: [PATCH v1] net/ice: refactor flow pattern parserDistinguish inner/outer fields. And avoid too many nested conditionals in each type's parser.
[Cao, Yahui]
Since this is quite a huge refactor, could you give a more detailed description in the commit message? Thanks. It would be better if you can make them a patchset.Thanks Yahui, will add more details. All changes in one function.
Quoted 30 lines
Quoted 30 lines
Signed-off-by Zhirun Yan <[email protected]>--- drivers/net/ice/ice_fdir_filter.c | 504 ++++++++++++++++-------------- 1 file changed, 269 insertions(+), 235 deletions(-)drivers/net/ice/ice_fdir_filter.c +7
-1@@ -1646,7 +1646,9 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,const struct rte_flow_item_vxlan *vxlan_spec, *vxlan_mask;const struct rte_flow_item_gtp *gtp_spec, *gtp_mask;const struct rte_flow_item_gtp_psc *gtp_psc_spec, *gtp_psc_mask; -uint64_t input_set =ICE_INSET_NONE ; +uint64_t inner_input_set =ICE_INSET_NONE ; +uint64_t outer_input_set =ICE_INSET_NONE ; +uint64_t *input_set;uint8_t flow_type =ICE_FLTR_PTYPE_NONF_NONE ;uint8_t ipv6_addr_mask[16 ] = {0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,0xFF ,@@ -1655,289 +1657,315 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,uint32_t vtc_flow_cpu;uint16_t ether_type;enum rte_flow_item_type next_type; +bool is_outer = true; +struct ice_fdir_extra *p_ext_data; +struct ice_fdir_v4 *p_v4; +struct ice_fdir_v6 *p_v6;Quoted 7 lines
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1669
Quoted 5 lines
drivers/net/ice/ice_fdir_filter.c +5
-0+for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) { +if (item->type ==RTE_FLOW_ITEM_TYPE_VXLAN ) { + tunnel_type =ICE_FDIR_TUNNEL_TYPE_VXLAN ; +break ; + }[Cao, Yahui]
You should take both of VXLAN and GTP cases into considerationYes, will add GTP in v2.
Quoted 24 lines
Quoted 24 lines
drivers/net/ice/ice_fdir_filter.c +14
-3+ } + +/* This loop parse flow pattern and distinguish Non-tunnel and tunnel +* flow. For tunnel flow, reuse non-tunnel structure to track inner +* part. +* +* is_outer tunnel_type p_input_set input_set_bit data_struct +* Non-Tun Y N inner outer origin +* Tun-out Y Y outer outer outer +* Tun-in N Y inner inner origin +*/ for (item = pattern; item->type !=RTE_FLOW_ITEM_TYPE_END ; item++) {if (item->last) {rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Not support range" ); +RTE_FLOW_ERROR_TYPE_ITEM , + item, +"Not support range" );return -rte_errno; } item_type = item->type;Quoted 17 lines
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1703
Quoted 13 lines
drivers/net/ice/ice_fdir_filter.c +13
-0+ input_set = (tunnel_type && is_outer) ? + &outer_input_set : + &inner_input_set; + +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV4 ) + p_v4 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v4 : + &filter->input.ip.v4; +if (l3 ==RTE_FLOW_ITEM_TYPE_IPV6 ) + p_v6 = (tunnel_type && is_outer) ? + &filter->input.ip_outer.v6 : + &filter->input.ip.v6; +[Cao, Yahui]
Why do you putp_v4value assignment out of switch caseRTE_FLOW_ITEM_TYPE_IPV4? Why do you putp_v6value assignment out of switch caseRTE_FLOW_ITEM_TYPE_IPV6?Yes, for RTE_FLOW_ITEM_TYPE_IPV4/6, p_v4/6 assigned in each case as you say.
But this is only for L4 layer parser. For L4 layer, the p_v4/6 is the shared pointer will be used after L3 loop.
Quoted 17 lines
Quoted 17 lines
drivers/net/ice/ice_fdir_filter.c +3
-8switch (item_type) {case RTE_FLOW_ITEM_TYPE_ETH : + flow_type =ICE_FLTR_PTYPE_NON_IP_L2 ; eth_spec = item->spec; eth_mask = item->mask; - next_type = (item +1 )->type; -if (eth_spec && eth_mask) { -if (!rte_is_zero_ether_addr (ð_mask->dst)) { - input_set |=ICE_INSET_DMAC ; -rte_memcpy (&filter->input.ext_data.dst_mac, - ð_spec->dst, -RTE_ETHER_ADDR_LEN ); - } +if (!(eth_spec && eth_mask)) +break ;Quoted 10 lines
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1713
Quoted 7 lines
drivers/net/ice/ice_fdir_filter.c +1
-6-if (!rte_is_zero_ether_addr (ð_mask->src)) { - input_set |=ICE_INSET_SMAC ; -rte_memcpy (&filter->input.ext_data.src_mac, - ð_spec->src, -RTE_ETHER_ADDR_LEN ); - } + *input_set |= is_outer ?ICE_PROT_MAC_OUTER :ICE_PROT_MAC_INNER ;[Cao, Yahui]
ICE_PROT_XXXis internally used. You should useICE_INSET_XXXversion. The same comment applies for similar case elsewhere.
Quoted 5 lines
How to distinguish internally used?
ICE_PROT_XXXandICE_INSET_XXXare defined in same fileice_generic_flow.h. And this kind of macro tries to introduce inner/outer bit to distinguish inner/outer, but actually it will mix field with its location. For FDIR, it seems not a good way.
[Cao, Yahui]
The distinguish rule is that only ICE_INSET_XXX is allowed to be used for input_set value. Otherwise, it may cause malfunction.
Quoted 3 lines
There is much more cases for inner/outer and src/dst. So I try to use this line to set outer/inner bit first, and src/dst bit can be reused.
[Cao, Yahui]
It is a historical reason that input_set have both inner and outer field defined.
To not break the original design and also compatible with current design,
I suggest we can just deprecate the tunnel version field ICE_INSET_TUN_XXX and instead use the non-tunnel version like ICE_INSET_XXX.
For example, if you specify a vxlan filter rule with outter src ip and inner dst udp, The value is like:outer_input_set = ICE_INSET_IPV4_SRCinner_input_set = ICE_INSET_UDP_DST_PORT
Quoted 37 lines
Quoted 5 lines
drivers/net/ice/ice_fdir_filter.c ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, · line 1715
Quoted 2 lines
drivers/net/ice/ice_fdir_filter.c +2
-0+if (!rte_is_zero_ether_addr (ð_mask->dst)) + *input_set |=ICE_DMAC ;[Cao, Yahui]
You should not useICE_DMAChere. You should useICE_INSET_XXXversion. The same comment applies for similar case elsewhere.I guess this part should re-design if we want to use. So I prefer not to use it.
Quoted 20 lines
Quoted 19 lines
drivers/net/ice/ice_fdir_filter.c +2
-16+if (!rte_is_zero_ether_addr (ð_mask->src)) + *input_set |=ICE_SMAC ; -/* Ignore this field except for ICE_FLTR_PTYPE_NON_IP_L2 */ -if (eth_mask->type ==RTE_BE16 (0xffff ) && - next_type ==RTE_FLOW_ITEM_TYPE_END ) { - input_set |=ICE_INSET_ETHERTYPE ; - ether_type =rte_be_to_cpu_16 (eth_spec->type); - -if (ether_type ==RTE_ETHER_TYPE_IPV4 || - ether_type ==RTE_ETHER_TYPE_IPV6 ) { -rte_flow_error_set (error,EINVAL , -RTE_FLOW_ERROR_TYPE_ITEM , - item, -"Unsupported ether_type." ); -return -rte_errno; - } - - rte_memcpy(&filter->input.ext_data.ether_type,....
Quoted 4 lines
Quoted 3 lines
}
--
2.25.1--
Best regards,
Zhirun Yan