net/ice/base: fix VXLAN flow director creation

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.

Fixes: 608cd0a5e283 ("net/ice/base: support VXLAN VNI field in flow director")
Cc: stable@dpdk.org
Signed-off-by: Dapeng Yu <dapengx.yu@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index 926f9c5..2e47700 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -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);

diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h
index 0ebf7f3..1ba1084 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.h
+++ b/drivers/net/ice/base/ice_fdir.h
@@ -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
 

diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h
index ce508a0..2644d5d 100644 (file)
--- a/drivers/net/ice/base/ice_type.h
+++ b/drivers/net/ice/base/ice_type.h
@@ -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,
 };