net/ice/base: support GTPU IP inner IPv6 for flow director

Support IPV4_GTPU with inner IPV6/UDP/TCP for FDIR.

Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>

diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_fdir.c
index 3df3de1..689e96d 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.c
+++ b/drivers/net/ice/base/ice_fdir.c
@@ -249,6 +249,54 @@ static const u8 ice_fdir_icmp4_gtpu4_pkt[] = {
        0x00, 0x00,
 };
 
+static const u8 ice_fdir_ipv6_gtpu4_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x4c, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x38,
+       0x24, 0x42, 0x30, 0xff, 0x00, 0x28, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_udp6_gtpu4_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x54, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x40,
+       0x4e, 0x3d, 0x30, 0xff, 0x00, 0x30, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08,
+       0x11, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+       0xff, 0xdc, 0x00, 0x00,
+};
+
+static const u8 ice_fdir_tcp6_gtpu4_pkt[] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00,
+       0x00, 0x62, 0x00, 0x01, 0x00, 0x00, 0x40, 0x11,
+       0x7c, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x4e,
+       0x59, 0x08, 0x30, 0xff, 0x00, 0x3e, 0x00, 0x00,
+       0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x16,
+       0x06, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x14, 0x00, 0x50, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x02,
+       0x20, 0x00, 0x8f, 0x7b, 0x00, 0x00, 0x00, 0x00,
+};
+
 static const u8 ice_fdir_ipv6_gtpu6_pkt[] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
        0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00,
@@ -802,6 +850,27 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {
                sizeof(ice_fdir_ipv4_gtpu4_pkt),
                ice_fdir_ipv4_gtpu4_pkt,
        },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6,
+               sizeof(ice_fdir_ipv6_gtpu4_pkt),
+               ice_fdir_ipv6_gtpu4_pkt,
+               sizeof(ice_fdir_ipv6_gtpu4_pkt),
+               ice_fdir_ipv6_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_UDP,
+               sizeof(ice_fdir_udp6_gtpu4_pkt),
+               ice_fdir_udp6_gtpu4_pkt,
+               sizeof(ice_fdir_udp6_gtpu4_pkt),
+               ice_fdir_udp6_gtpu4_pkt,
+       },
+       {
+               ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_TCP,
+               sizeof(ice_fdir_tcp6_gtpu4_pkt),
+               ice_fdir_tcp6_gtpu4_pkt,
+               sizeof(ice_fdir_tcp6_gtpu4_pkt),
+               ice_fdir_tcp6_gtpu4_pkt,
+       },
        {
                ICE_FLTR_PTYPE_NONF_IPV6_GTPU,
                sizeof(ice_fdir_ipv6_gtpu6_pkt),
@@ -1391,6 +1460,9 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4:
                case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP:
                case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_UDP:
+               case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_TCP:
                        ice_memcpy(pkt, ice_fdir_pkt[idx].tun_pkt,
                                   ice_fdir_pkt[idx].tun_pkt_len,
                                   ICE_NONDMA_TO_NONDMA);
@@ -1575,6 +1647,40 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,
                ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TOS_OFFSET, input->ip.v4.tos);
                ice_pkt_insert_u8(loc, ICE_IPV4_NO_MAC_TTL_OFFSET, input->ip.v4.ttl);
                break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
+               ice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET, input->ip.v6.tc);
+               ice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET, input->ip.v6.hlim);
+               ice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_PROTO_OFFSET,
+                                 input->ip.v6.proto);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_UDP:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
+               ice_pkt_insert_u16(loc, ICE_UDP6_NO_MAC_DST_PORT_OFFSET,
+                                  input->ip.v6.src_port);
+               ice_pkt_insert_u16(loc, ICE_UDP6_NO_MAC_SRC_PORT_OFFSET,
+                                  input->ip.v6.dst_port);
+               ice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET, input->ip.v6.tc);
+               ice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET, input->ip.v6.hlim);
+               break;
+       case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_TCP:
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_DST_ADDR_OFFSET,
+                                        input->ip.v6.src_ip);
+               ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET,
+                                        input->ip.v6.dst_ip);
+               ice_pkt_insert_u16(loc, ICE_TCP6_NO_MAC_DST_PORT_OFFSET,
+                                  input->ip.v6.src_port);
+               ice_pkt_insert_u16(loc, ICE_TCP6_NO_MAC_SRC_PORT_OFFSET,
+                                  input->ip.v6.dst_port);
+               ice_pkt_insert_u8_tc(loc, ICE_IPV6_NO_MAC_TC_OFFSET, input->ip.v6.tc);
+               ice_pkt_insert_u8(loc, ICE_IPV6_NO_MAC_HLIM_OFFSET, input->ip.v6.hlim);
+               break;
        case ICE_FLTR_PTYPE_NONF_IPV6_GTPU:
        case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER:
                ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET,

diff --git a/drivers/net/ice/base/ice_fdir.h b/drivers/net/ice/base/ice_fdir.h
index e236f13..6573f96 100644 (file)
--- a/drivers/net/ice/base/ice_fdir.h
+++ b/drivers/net/ice/base/ice_fdir.h
@@ -56,6 +56,15 @@
 #define ICE_TCP4_NO_MAC_DST_PORT_OFFSET        22
 #define ICE_UDP4_NO_MAC_SRC_PORT_OFFSET        20
 #define ICE_UDP4_NO_MAC_DST_PORT_OFFSET        22
+#define ICE_IPV6_NO_MAC_TC_OFFSET      0
+#define ICE_IPV6_NO_MAC_HLIM_OFFSET    7
+#define ICE_IPV6_NO_MAC_PROTO_OFFSET   6
+#define ICE_IPV6_NO_MAC_SRC_ADDR_OFFSET        8
+#define ICE_IPV6_NO_MAC_DST_ADDR_OFFSET        24
+#define ICE_TCP6_NO_MAC_SRC_PORT_OFFSET        40
+#define ICE_TCP6_NO_MAC_DST_PORT_OFFSET        42
+#define ICE_UDP6_NO_MAC_SRC_PORT_OFFSET        40
+#define ICE_UDP6_NO_MAC_DST_PORT_OFFSET        42
 #define ICE_IPV4_GTPU_TEID_OFFSET      46
 #define ICE_IPV4_GTPU_QFI_OFFSET       56
 #define ICE_IPV6_GTPU_TEID_OFFSET      66

diff --git a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h
index 102c209..2550e0e 100644 (file)
--- a/drivers/net/ice/base/ice_type.h
+++ b/drivers/net/ice/base/ice_type.h
@@ -316,6 +316,9 @@ enum ice_fltr_ptype {
        ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4,
        ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP,
        ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6,
+       ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_UDP,
+       ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV6_TCP,
        ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4,
        ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_UDP,
        ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_TCP,