net/ice/base: fix VXLAN flow director creation error
PATCH 1/2 net/ice/base: fix VXLAN flow director creation error
From: Dapeng Yu <[email protected]>
In original implementation, error returned when creating VXLAN flow director with SCTP or TCP as layer 4 protocol of inner segment.
There are several root causes for the error:
1. ice_fdir_udp4_vxlan_pkt[] is not adapted to the TCP and SCTP protocol. Its length cannot hold TCP header, only UDP protocol was supported in original implementation
2. VXLAN VNI offset: 45 is inconsistent with IETF RFC 7348
This patch fixes those defects described above.
--- drivers/net/ice/base/ice_fdir.c | 99 +++++++++++++++++++++++++++++++++ drivers/net/ice/base/ice_fdir.h | 2 +- drivers/net/ice/base/ice_type.h | 4 ++ 3 files changed, 104 insertions(+), 1 deletion(-)
drivers/net/ice/base/ice_fdir.c +99 -0
@@ -1023,6 +1023,26 @@ 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_IPV4_UDP_VXLAN_IPV4_UDP , +sizeof (ice_fdir_udp4_tun_pkt), ice_fdir_udp4_tun_pkt, +sizeof (ice_fdir_udp4_tun_pkt), ice_fdir_udp4_tun_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP , +sizeof (ice_fdir_tcp4_tun_pkt), ice_fdir_tcp4_tun_pkt, +sizeof (ice_fdir_tcp4_tun_pkt), ice_fdir_tcp4_tun_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP , +sizeof (ice_fdir_sctp4_tun_pkt), ice_fdir_sctp4_tun_pkt, +sizeof (ice_fdir_sctp4_tun_pkt), ice_fdir_sctp4_tun_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER , +sizeof (ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt, +sizeof (ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt, + }, {ICE_FLTR_PTYPE_NONF_ECPRI_TP0 , sizeof(ice_fdir_ecpri_tp0_pkt), ice_fdir_ecpri_tp0_pkt,
@@ -1583,6 +1603,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,ice_pkt_insert_mac_addr (loc, input->ext_data.dst_mac);break ;case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN : +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP :ice_pkt_insert_mac_addr (pkt, input->ext_data_outer.dst_mac);ice_pkt_insert_mac_addr (pkt +ETH_ALEN , input->ext_data_outer.src_mac); ice_pkt_insert_u32(pkt, ICE_IPV4_SRC_ADDR_OFFSET,
@@ -1605,6 +1626,84 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,ice_pkt_insert_mac_addr (loc, input->ext_data.dst_mac);ice_pkt_insert_mac_addr (loc +ETH_ALEN , input->ext_data.src_mac);break ; +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP : +ice_pkt_insert_mac_addr (pkt, input->ext_data_outer.dst_mac); +ice_pkt_insert_mac_addr (pkt +ETH_ALEN , + input->ext_data_outer.src_mac); +ice_pkt_insert_u32 (pkt,ICE_IPV4_SRC_ADDR_OFFSET , + input->ip_outer.v4.dst_ip); +ice_pkt_insert_u32 (pkt,ICE_IPV4_DST_ADDR_OFFSET , + input->ip_outer.v4.src_ip); +ice_pkt_insert_u8 (pkt,ICE_IPV4_TOS_OFFSET , + input->ip_outer.v4.tos); +ice_pkt_insert_u32 (pkt,ICE_IPV4_VXLAN_VNI_OFFSET , + input->vxlan_data.vni); +ice_pkt_insert_u32 (loc,ICE_IPV4_DST_ADDR_OFFSET , + input->ip.v4.src_ip); +ice_pkt_insert_u16 (loc,ICE_IPV4_TCP_DST_PORT_OFFSET , + input->ip.v4.src_port); +ice_pkt_insert_u32 (loc,ICE_IPV4_SRC_ADDR_OFFSET , + input->ip.v4.dst_ip); +ice_pkt_insert_u16 (loc,ICE_IPV4_TCP_SRC_PORT_OFFSET , + input->ip.v4.dst_port); +ice_pkt_insert_u8 (loc,ICE_IPV4_TOS_OFFSET , input->ip.v4.tos); +ice_pkt_insert_u8 (loc,ICE_IPV4_TTL_OFFSET , input->ip.v4.ttl); +ice_pkt_insert_mac_addr (loc, input->ext_data.dst_mac); +ice_pkt_insert_mac_addr (loc +ETH_ALEN , + input->ext_data.src_mac); +if (frag) + loc[20 ] =ICE_FDIR_IPV4_PKT_FLAG_MF ; +break ; +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP : +ice_pkt_insert_mac_addr (pkt, input->ext_data_outer.dst_mac); +ice_pkt_insert_mac_addr (pkt +ETH_ALEN , + input->ext_data_outer.src_mac); +ice_pkt_insert_u32 (pkt,ICE_IPV4_SRC_ADDR_OFFSET , + input->ip_outer.v4.dst_ip); +ice_pkt_insert_u32 (pkt,ICE_IPV4_DST_ADDR_OFFSET , + input->ip_outer.v4.src_ip); +ice_pkt_insert_u8 (pkt,ICE_IPV4_TOS_OFFSET , + input->ip_outer.v4.tos); +ice_pkt_insert_u32 (pkt,ICE_IPV4_VXLAN_VNI_OFFSET , + input->vxlan_data.vni); +ice_pkt_insert_u32 (loc,ICE_IPV4_DST_ADDR_OFFSET , + input->ip.v4.src_ip); +ice_pkt_insert_u16 (loc,ICE_IPV4_SCTP_DST_PORT_OFFSET , + input->ip.v4.src_port); +ice_pkt_insert_u32 (loc,ICE_IPV4_SRC_ADDR_OFFSET , + input->ip.v4.dst_ip); +ice_pkt_insert_u16 (loc,ICE_IPV4_SCTP_SRC_PORT_OFFSET , + input->ip.v4.dst_port); +ice_pkt_insert_u8 (loc,ICE_IPV4_TOS_OFFSET , input->ip.v4.tos); +ice_pkt_insert_u8 (loc,ICE_IPV4_TTL_OFFSET , input->ip.v4.ttl); +ice_pkt_insert_mac_addr (loc, input->ext_data.dst_mac); +ice_pkt_insert_mac_addr (loc +ETH_ALEN , + input->ext_data.src_mac); +break ; +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER : +ice_pkt_insert_mac_addr (pkt, input->ext_data_outer.dst_mac); +ice_pkt_insert_mac_addr (pkt +ETH_ALEN , + input->ext_data_outer.src_mac); +ice_pkt_insert_u32 (pkt,ICE_IPV4_SRC_ADDR_OFFSET , + input->ip_outer.v4.dst_ip); +ice_pkt_insert_u32 (pkt,ICE_IPV4_DST_ADDR_OFFSET , + input->ip_outer.v4.src_ip); +ice_pkt_insert_u8 (pkt,ICE_IPV4_TOS_OFFSET , + input->ip_outer.v4.tos); +ice_pkt_insert_u32 (pkt,ICE_IPV4_VXLAN_VNI_OFFSET , + input->vxlan_data.vni); +ice_pkt_insert_u32 (loc,ICE_IPV4_DST_ADDR_OFFSET , + input->ip.v4.src_ip); +ice_pkt_insert_u32 (loc,ICE_IPV4_SRC_ADDR_OFFSET , + input->ip.v4.dst_ip); +ice_pkt_insert_u8 (loc,ICE_IPV4_TOS_OFFSET , input->ip.v4.tos); +ice_pkt_insert_u8 (loc,ICE_IPV4_TTL_OFFSET , input->ip.v4.ttl); +ice_pkt_insert_u8 (loc,ICE_IPV4_PROTO_OFFSET , + input->ip.v4.proto); +ice_pkt_insert_mac_addr (loc, input->ext_data.dst_mac); +ice_pkt_insert_mac_addr (loc +ETH_ALEN , + input->ext_data.src_mac); +break ;case ICE_FLTR_PTYPE_NONF_IPV4_GTPU :ice_pkt_insert_u32 (loc,ICE_IPV4_DST_ADDR_OFFSET , input->ip.v4.src_ip);
drivers/net/ice/base/ice_fdir.h +1 -1
@@ -79,7 +79,7 @@#define ICE_IPV6_AH_SPI_OFFSET 58#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_IPV4_VXLAN_VNI_OFFSET 46#define ICE_ECPRI_TP0_PC_ID_OFFSET 18#define ICE_IPV4_UDP_ECPRI_TP0_PC_ID_OFFSET 46
drivers/net/ice/base/ice_type.h +4 -0
@@ -353,6 +353,10 @@ enum ice_fltr_ptype {ICE_FLTR_PTYPE_NONF_IPV6_SCTP ,ICE_FLTR_PTYPE_NONF_IPV6_OTHER ,ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN , +ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP , +ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP , +ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP , +ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER , ICE_FLTR_PTYPE_MAX, };
Signature · 1 line
2.27.0
PATCH 2/2 net/ice: fix VXLAN flow director creation error
From: Dapeng Yu <[email protected]>
In original implementation, error returned when creating VXLAN flow director with SCTP or TCP as layer 4 protocol of inner segment.
There are several root causes for the error:
1. ice_fdir_input_set_hdrs() set ICE_FLOW_SEG_HDR_UDP into protocol header flag of inner segment of VXLAN FDIR rule, even if it shall be ICE_FLOW_SEG_HDR_TCP or ICE_FLOW_SEG_HDR_SCTP
2. ice_fdir_input_set_hdrs() set ICE_FLOW_SEG_HDR_VXLAN into protocol header flag of segments of VXLAN FDIR rule, it not necessary, and can be set automatically by ice_flow_set_fld() later
3. flow type: ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN hides the flow type of inner segment of VXLAN FDIR rule, then further causes function:ice_fdir_get_gen_prgm_pkt() cannot write correct protocol id into inner segment of training packet.
This patch fixes those defects described above.
--- drivers/net/ice/ice_fdir_filter.c | 47 ++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 7 deletions(-)
drivers/net/ice/ice_fdir_filter.c +40 -7
@@ -786,6 +786,28 @@ ice_fdir_cross_prof_conflict(struct ice_pf *pf, (pf, cflct_ptype, is_tunnel)) goto err;break ; +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP : +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP : +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP : + cflct_ptype =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER ; +if (!ice_fdir_prof_resolve_conflict + (pf, cflct_ptype, is_tunnel)) + goto err; +break ; +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER : + cflct_ptype =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP ; +if (!ice_fdir_prof_resolve_conflict + (pf, cflct_ptype, is_tunnel)) + goto err; + cflct_ptype =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP ; +if (!ice_fdir_prof_resolve_conflict + (pf, cflct_ptype, is_tunnel)) + goto err; + cflct_ptype =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP ; +if (!ice_fdir_prof_resolve_conflict + (pf, cflct_ptype, is_tunnel)) + goto err; +break ;default :break ; }
@@ -968,11 +990,12 @@ ice_fdir_input_set_hdrs(enum ice_fltr_ptype flow, struct ice_flow_seg_info *seg)ICE_FLOW_SET_HDRS (seg,ICE_FLOW_SEG_HDR_IPV6 |ICE_FLOW_SEG_HDR_IPV_FRAG );break ; -case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN : -ICE_FLOW_SET_HDRS (seg,ICE_FLOW_SEG_HDR_UDP | -ICE_FLOW_SEG_HDR_IPV4 | -ICE_FLOW_SEG_HDR_VXLAN | -ICE_FLOW_SEG_HDR_IPV_OTHER ); +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP : +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP : +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP : +break ; +case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER : +ICE_FLOW_SET_HDRS (seg,ICE_FLOW_SEG_HDR_IPV_OTHER );break ;case ICE_FLTR_PTYPE_NONF_IPV4_GTPU : ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP |
@@ -2073,8 +2096,18 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,else if (tunnel_type ==ICE_FDIR_TUNNEL_TYPE_GTPU_EH && flow_type ==ICE_FLTR_PTYPE_NONF_IPV6_UDP ) flow_type =ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH ; -else if (tunnel_type ==ICE_FDIR_TUNNEL_TYPE_VXLAN ) - flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN ; +else if (tunnel_type ==ICE_FDIR_TUNNEL_TYPE_VXLAN && + flow_type ==ICE_FLTR_PTYPE_NONF_IPV4_UDP ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_UDP ; +else if (tunnel_type ==ICE_FDIR_TUNNEL_TYPE_VXLAN && + flow_type ==ICE_FLTR_PTYPE_NONF_IPV4_TCP ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_TCP ; +else if (tunnel_type ==ICE_FDIR_TUNNEL_TYPE_VXLAN && + flow_type ==ICE_FLTR_PTYPE_NONF_IPV4_SCTP ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_SCTP ; +else if (tunnel_type ==ICE_FDIR_TUNNEL_TYPE_VXLAN && + flow_type ==ICE_FLTR_PTYPE_NONF_IPV4_OTHER ) + flow_type =ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN_IPV4_OTHER ; filter->tunnel_type = tunnel_type; filter->input.flow_type = flow_type;
Signature · 1 line
2.27.0
Re: [dpdk-dev] [PATCH 2/2] net/ice: fix VXLAN flow director creation error
Quoted 29 lines
-----Original Message-----
From: Yu, DapengX <[email protected]>
Sent: Wednesday, June 16, 2021 9:21 AM
To: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Guo, Junfeng <[email protected]>; Yan, Zhirun <[email protected]>; Yu, DapengX <[email protected]>; [email protected]
Subject: [PATCH 2/2] net/ice: fix VXLAN flow director creation errorFrom: Dapeng Yu <[email protected]>
In original implementation, error returned when creating VXLAN flow director with SCTP or TCP as layer 4 protocol of inner segment.
There are several root causes for the error:
1.ice_fdir_input_set_hdrs()setICE_FLOW_SEG_HDR_UDPinto protocol header flag of inner segment of VXLAN FDIR rule, even if it shall beICE_FLOW_SEG_HDR_TCPorICE_FLOW_SEG_HDR_SCTP2.ice_fdir_input_set_hdrs()setICE_FLOW_SEG_HDR_VXLANinto protocol header flag of segments of VXLAN FDIR rule, it not necessary, and can be set automatically byice_flow_set_fld()later 3. flow type:ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLANhides the flow type of inner segment of VXLAN FDIR rule, then further causes function:ice_fdir_get_gen_prgm_pkt()cannot write correct protocol id into inner segment of training packet.
Quoted 6 lines
This patch fixes those defects described above.
Fixes 855d23a07b36 ("net/ice: support VXLAN VNI field in flow director")Signed-off-by Dapeng Yu <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi
Quoted 22 lines
-----Original Message-----
From: Yu, DapengX <[email protected]>
Sent: Wednesday, June 16, 2021 9:21 AM
To: Yang, Qiming <[email protected]>; Zhang, Qi Z <[email protected]>
Cc: [email protected]; Guo, Junfeng <[email protected]>; Yan, Zhirun <[email protected]>; Yu, DapengX <[email protected]>; [email protected]
Subject: [PATCH 1/2]net/ice/base: fix VXLAN flow director creation errorFrom: Dapeng Yu <[email protected]>
In original implementation, error returned when creating VXLAN flow director with SCTP or TCP as layer 4 protocol of inner segment.
There are several root causes for the error:
1. ice_fdir_udp4_vxlan_pkt[] is not adapted to the TCP and SCTP protocol. Its length cannot hold TCP header, only UDP protocol was supported in original implementation 2. VXLAN VNI offset: 45 is inconsistent with IETF RFC 7348
Quoted 6 lines
This patch fixes those defects described above.
Fixes 608cd0a5e283 ("net/ice/base: support VXLAN VNI field in flow director")Signed-off-by Dapeng Yu <[email protected]>
Applied to dpdk-next-net-intel.
Thanks
Qi